|
|
|
@ -948,14 +948,14 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (par->codec_type == AVMEDIA_TYPE_AUDIO) { |
|
|
|
|
if (!bit_depth && par->codec_id != AV_CODEC_ID_ADPCM_G726) { |
|
|
|
|
if (par->bits_per_raw_sample) |
|
|
|
|
bit_depth = par->bits_per_raw_sample; |
|
|
|
|
else |
|
|
|
|
bit_depth = av_get_bytes_per_sample(par->format) << 3; |
|
|
|
|
} |
|
|
|
|
if (!bit_depth) |
|
|
|
|
bit_depth = par->bits_per_coded_sample; |
|
|
|
|
if (!bit_depth && par->codec_id != AV_CODEC_ID_ADPCM_G726) { |
|
|
|
|
if (par->bits_per_raw_sample) |
|
|
|
|
bit_depth = par->bits_per_raw_sample; |
|
|
|
|
else |
|
|
|
|
bit_depth = av_get_bytes_per_sample(par->format) << 3; |
|
|
|
|
} |
|
|
|
|
if (!bit_depth) |
|
|
|
|
bit_depth = par->bits_per_coded_sample; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (par->codec_id == AV_CODEC_ID_AAC) { |
|
|
|
|