Merge pull request xbmc#1984 from FernetMenta/audiocodec

ffmpeg: backport latm: fix initialization on some streams when no extrad...
pieh · Dec 25, 2012 · 5e98e17 · 5e98e17
2 parents 89a81ea + 06d713f
commit 5e98e17
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/ffmpeg/libavcodec/aacdec.c b/lib/ffmpeg/libavcodec/aacdec.c
@@ -2403,7 +2403,8 @@ static int latm_decode_audio_specific_config(struct LATMContext *latmctx,
     if (bits_consumed < 0)
         return AVERROR_INVALIDDATA;
 
-    if (ac->m4ac.sample_rate != m4ac.sample_rate ||
+    if (!latmctx->initialized ||
+        ac->m4ac.sample_rate != m4ac.sample_rate ||
         ac->m4ac.chan_config != m4ac.chan_config) {
 
         av_log(avctx, AV_LOG_INFO, "audio config changed\n");