diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-23 22:41:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-23 22:41:10 +0200 |
| commit | 0bc5d4fd8bbb63be172978e888834a88a1e64fb0 (patch) | |
| tree | bbba93376ea3634be1ee881b7d9677f1af62564d /libavcodec | |
| parent | b6aaa6d9a081f4851e76f1182c959be3c09ee59c (diff) | |
| download | ffmpeg-0bc5d4fd8bbb63be172978e888834a88a1e64fb0.tar.gz | |
aacdec: fix channel reconfigs on LATM
Fixes Ticket200
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/aacdec.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; |