diff options
| author | davilla <davilla@xbmc.org> | 2012-12-25 07:48:02 -0800 |
|---|---|---|
| committer | davilla <davilla@xbmc.org> | 2012-12-25 07:48:02 -0800 |
| commit | 5e98e1720ec06bf37676324322e4adcf4eb848db (patch) | |
| tree | f0b461c4ba83762148f79f0ffe64fd0bb542d31d | |
| parent | 89a81ea7944d8a7724e87f8e1850ccbf5a506800 (diff) | |
| parent | 06d713fefaf19cb4dfb83126ba1c078d6dcabc67 (diff) | |
Merge pull request #1984 from FernetMenta/audiocodec
ffmpeg: backport latm: fix initialization on some streams when no extrad...
| -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"); |