diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-01-15 23:35:22 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-01-16 00:28:15 +0100 |
| commit | d6a705d7787ff10848de5533eee0bc61c40ea272 (patch) | |
| tree | bec45204d04b5dcb81dcb32c1c5267e1d1709e98 | |
| parent | e24b33cd68357d978e0798d861867cd988607e1f (diff) | |
| download | ffmpeg-d6a705d7787ff10848de5533eee0bc61c40ea272.tar.gz | |
Do not set mkv bit_depth to av_get_bytes_per_sample() for G.726.
The value is wrong and leads to broken files.
(cherry picked from commit 565102dcac4959da60e6b1528dc31315d21194ca)
| -rw-r--r-- | libavformat/matroskaenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 6a783e1011..05890d3577 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -567,7 +567,7 @@ static int mkv_write_tracks(AVFormatContext *s) continue; } - if (!bit_depth) + if (!bit_depth && codec->codec_id != AV_CODEC_ID_ADPCM_G726) bit_depth = av_get_bytes_per_sample(codec->sample_fmt) << 3; if (!bit_depth) bit_depth = codec->bits_per_coded_sample; |