diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2016-04-15 19:49:27 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-04-16 02:01:10 +0200 |
commit | c4fad02779911d9fc35c513286c89e631ba81967 (patch) | |
tree | a21c9113dd6193d6b9d3f58debee0da040f944d0 | |
parent | a676c29af5eeafa2e33acb6e6292c9717ae54796 (diff) | |
download | ffmpeg-c4fad02779911d9fc35c513286c89e631ba81967.tar.gz |
avformat/matroskaenc: Undo bits_per_coded_sample change as bits_per_raw_sample is available again
Reminded-by: James Almer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r-- | libavformat/matroskaenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 2be0629309..205bc1cad4 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -910,8 +910,8 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, } if (!bit_depth && par->codec_id != AV_CODEC_ID_ADPCM_G726) { - if (par->bits_per_coded_sample) - bit_depth = par->bits_per_coded_sample; + if (par->bits_per_raw_sample) + bit_depth = par->bits_per_raw_sample; else bit_depth = av_get_bytes_per_sample(par->format) << 3; } |