generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not read mkv audio bit_depth if bits_per_coded_sample is already set.

Browse Source 
This allows decoding broken mkv files containing G.726 audio.
(cherry picked from commit 1132937077)
This commit is contained in:
Carl Eugen Hoyos
2014-01-15 23:37:47 +01:00
parent d6a705d778
commit 30147f14d4
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/matroskadec.c
View File

@@ -1812,6 +1812,7 @@ static int matroska_read_header(AVFormatContext *s)
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
st->codec->sample_rate = track->audio.out_samplerate;
st->codec->channels = track->audio.channels;
if (!st->codec->bits_per_coded_sample)
st->codec->bits_per_coded_sample = track->audio.bitdepth;
if (st->codec->codec_id != AV_CODEC_ID_AAC)
st->need_parsing = AVSTREAM_PARSE_HEADERS;