diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2011-10-21 17:25:30 +0200 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2011-12-03 00:42:48 +0100 |
| commit | fd095539d10bb440042e671f95306b16b0fec674 (patch) | |
| tree | c28e329a98879823371f7b3e3f388f83f3805fab /libavformat/matroskaenc.c | |
| parent | 0eea212943544d40f99b05571aa7159d78667154 (diff) | |
latmdec: fix audio specific config parsing
Pass the correct size in bits to mpeg4audio_get_config and add a flag
to disable parsing of the sync extension when the size is not known.
Latm with AudioMuxVersion 0 does not specify the size of the audio
specific config. Data after the audio specific config can be
misinterpreted as sync extension resulting in random and wrong configs.
Diffstat (limited to 'libavformat/matroskaenc.c')
| -rw-r--r-- | libavformat/matroskaenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index b8c73bf950..9f8d5d853b 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -448,7 +448,8 @@ static void get_aac_sample_rates(AVFormatContext *s, AVCodecContext *codec, int { MPEG4AudioConfig mp4ac; - if (avpriv_mpeg4audio_get_config(&mp4ac, codec->extradata, codec->extradata_size) < 0) { + if (avpriv_mpeg4audio_get_config(&mp4ac, codec->extradata, + codec->extradata_size * 8, 1) < 0) { av_log(s, AV_LOG_WARNING, "Error parsing AAC extradata, unable to determine samplerate.\n"); return; } |