From 0bc5d4fd8bbb63be172978e888834a88a1e64fb0 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 23 Sep 2011 22:41:10 +0200 Subject: [PATCH] aacdec: fix channel reconfigs on LATM Fixes Ticket200 Signed-off-by: Michael Niedermayer --- libavcodec/aacdec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 3c73ad2fa1..09d83db4fa 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -2313,6 +2313,7 @@ static int latm_decode_audio_specific_config(struct LATMContext *latmctx, { AVCodecContext *avctx = latmctx->aac_ctx.avctx; MPEG4AudioConfig m4ac; + AACContext *ac= &latmctx->aac_ctx; int config_start_bit = get_bits_count(gb); int bits_consumed, esize; @@ -2322,12 +2323,13 @@ static int latm_decode_audio_specific_config(struct LATMContext *latmctx, return AVERROR_INVALIDDATA; } else { bits_consumed = - decode_audio_specific_config(NULL, avctx, &m4ac, + decode_audio_specific_config(ac, avctx, &m4ac, gb->buffer + (config_start_bit / 8), get_bits_left(gb) / 8, asclen); if (bits_consumed < 0) return AVERROR_INVALIDDATA; + ac->m4ac= m4ac; esize = (bits_consumed+7) / 8;