From b4d0e7804dbeeca179198791acddf3058771a32a Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 20 Oct 2011 21:57:52 +0200 Subject: [PATCH] aacdec:only overwrite configuration if theres a actual change. Fixes Ticket574 Signed-off-by: Michael Niedermayer --- libavcodec/aacdec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 64f89723f0..6963d71a3f 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -2321,8 +2321,8 @@ static int latm_decode_audio_specific_config(struct LATMContext *latmctx, GetBitContext *gb, int asclen) { AVCodecContext *avctx = latmctx->aac_ctx.avctx; - MPEG4AudioConfig m4ac; AACContext *ac= &latmctx->aac_ctx; + MPEG4AudioConfig m4ac=ac->m4ac; int config_start_bit = get_bits_count(gb); int bits_consumed, esize; @@ -2338,7 +2338,8 @@ static int latm_decode_audio_specific_config(struct LATMContext *latmctx, if (bits_consumed < 0) return AVERROR_INVALIDDATA; - ac->m4ac= m4ac; + if(ac->m4ac.sample_rate != m4ac.sample_rate || m4ac.chan_config != ac->m4ac.chan_config) + ac->m4ac= m4ac; esize = (bits_consumed+7) / 8;