aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2011-12-23 00:14:32 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-07-08 00:26:26 +0200
commitd039b6074ca68da9b6dc88d8bb40056fee9fecb6 (patch)
tree2797e2416812b665672fd24dd489822f77e2bbbf
parent70731745515218355adb4949b92eed8e92cfad1d (diff)
downloadffmpeg-d039b6074ca68da9b6dc88d8bb40056fee9fecb6.tar.gz
latm: fix initialization on some streams when no extradata is available
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/aacdec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 1b9a203006..6d07beab5d 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -2661,7 +2661,8 @@ static int latm_decode_audio_specific_config(struct LATMContext *latmctx,
if (bits_consumed < 0)
return AVERROR_INVALIDDATA;
- if (ac->oc[1].m4ac.sample_rate != m4ac.sample_rate ||
+ if (!latmctx->initialized ||
+ ac->oc[1].m4ac.sample_rate != m4ac.sample_rate ||
ac->oc[1].m4ac.chan_config != m4ac.chan_config) {
av_log(avctx, AV_LOG_INFO, "audio config changed\n");