har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aacdec: fix channel reconfigs on LATM

Browse Source 
Fixes Ticket200

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-09-23 22:41:10 +02:00
parent b6aaa6d9a0
commit 0bc5d4fd8b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/aacdec.c
View File

@ -2313,6 +2313,7 @@ static int latm_decode_audio_specific_config(struct LATMContext *latmctx,
{ {
AVCodecContext *avctx = latmctx->aac_ctx.avctx; AVCodecContext *avctx = latmctx->aac_ctx.avctx;
MPEG4AudioConfig m4ac; MPEG4AudioConfig m4ac;
AACContext *ac= &latmctx->aac_ctx;
int config_start_bit = get_bits_count(gb); int config_start_bit = get_bits_count(gb);
int bits_consumed, esize; int bits_consumed, esize;
@ -2322,12 +2323,13 @@ static int latm_decode_audio_specific_config(struct LATMContext *latmctx,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} else { } else {
bits_consumed = bits_consumed =
decode_audio_specific_config(NULL, avctx, &m4ac, decode_audio_specific_config(ac, avctx, &m4ac,
gb->buffer + (config_start_bit / 8), gb->buffer + (config_start_bit / 8),
get_bits_left(gb) / 8, asclen); get_bits_left(gb) / 8, asclen);
if (bits_consumed < 0) if (bits_consumed < 0)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
ac->m4ac= m4ac;
esize = (bits_consumed+7) / 8; esize = (bits_consumed+7) / 8;