summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2014-01-15 23:35:22 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2014-01-15 23:35:22 +0100
commit565102dcac4959da60e6b1528dc31315d21194ca (patch)
tree45bffbcecb8a9cae39867caadcd47aff5211e936 /libavformat
parentb948ab8132e24d215072120e210139dc456d4997 (diff)
Do not set mkv bit_depth to av_get_bytes_per_sample() for G.726.
The value is wrong and leads to broken files.
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/matroskaenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 82624b740d..11174f1a3d 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -620,7 +620,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;