[FFmpeg-cvslog] Do not set mkv bit_depth to av_get_bytes_per_sample() for G.726.

[Carl Eugen Hoyos]

ffmpeg | branch: release/1.2 | Carl Eugen Hoyos <cehoyos at ag.or.at> | Wed Jan 15 23:35:22 2014 +0100| [d6a705d7787ff10848de5533eee0bc61c40ea272] | committer: Carl Eugen Hoyos

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)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d6a705d7787ff10848de5533eee0bc61c40ea272
---

 libavformat/matroskaenc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 6a783e1..05890d3 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;