Skip to content
This repository
Browse code

Merge pull request #1984 from FernetMenta/audiocodec

ffmpeg: backport latm: fix initialization on some streams when no extrad...
  • Loading branch information...
commit 5e98e1720ec06bf37676324322e4adcf4eb848db 2 parents 89a81ea + 06d713f
davilla authored December 25, 2012

Showing 1 changed file with 2 additions and 1 deletion. Show diff stats Hide diff stats

  1. 3  lib/ffmpeg/libavcodec/aacdec.c
3  lib/ffmpeg/libavcodec/aacdec.c
@@ -2403,7 +2403,8 @@ static int latm_decode_audio_specific_config(struct LATMContext *latmctx,
2403 2403
     if (bits_consumed < 0)
2404 2404
         return AVERROR_INVALIDDATA;
2405 2405
 
2406  
-    if (ac->m4ac.sample_rate != m4ac.sample_rate ||
  2406
+    if (!latmctx->initialized ||
  2407
+        ac->m4ac.sample_rate != m4ac.sample_rate ||
2407 2408
         ac->m4ac.chan_config != m4ac.chan_config) {
2408 2409
 
2409 2410
         av_log(avctx, AV_LOG_INFO, "audio config changed\n");

0 notes on commit 5e98e17

Please sign in to comment.
Something went wrong with that request. Please try again.