diff options
| author | xbmc <fernetmenta@online.de> | 2012-12-25 08:35:36 +0100 |
|---|---|---|
| committer | xbmc <fernetmenta@online.de> | 2012-12-25 08:35:36 +0100 |
| commit | 06d713fefaf19cb4dfb83126ba1c078d6dcabc67 (patch) | |
| tree | b0414c268c9e641325ee0001bd4b92d9a2a1a875 /lib/ffmpeg/libavcodec | |
| parent | 7e7dce7928ea2d57c1ee2d0e2b82082d997ac578 (diff) | |
ffmpeg: backport latm: fix initialization on some streams when no extradata is available: d039b6074ca68da9b6dc88d8bb40056fee9fecb6
Diffstat (limited to 'lib/ffmpeg/libavcodec')
| -rw-r--r-- | lib/ffmpeg/libavcodec/aacdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ffmpeg/libavcodec/aacdec.c b/lib/ffmpeg/libavcodec/aacdec.c index 5c6404e0a4..ad2991b44a 100644 --- 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"); |