Browse Source

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

This allows decoding broken mkv files containing G.726 audio.
tags/n2.2-rc1
Carl Eugen Hoyos 12 years ago
parent
commit
1132937077
1 changed files with 1 additions and 0 deletions
  1. +1
    -0
      libavformat/matroskadec.c

+ 1
- 0
libavformat/matroskadec.c View File

@@ -1909,6 +1909,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;


Loading…
Cancel
Save