From 3aca10bf762a94d7de555cedf1ff0e4f6792bf41 Mon Sep 17 00:00:00 2001 From: Hendrik Leppkes Date: Fri, 23 Dec 2011 00:14:32 +0100 Subject: latm: Always reconfigure if no extradata was set previously AAC LOAS can have new audio config objects in the stream itself. Make sure the decoder reconfigures itself when the first one arrives midstream. Bug-Id: 644 Signed-off-by: Luca Barbato --- libavcodec/aacdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavcodec/aacdec.c') diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index a3652098db..e25838fca0 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -3030,7 +3030,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"); -- cgit v1.2.3