aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Grunau <janne-ffmpeg@jannau.net>2010-11-04 21:00:01 +0000
committerJanne Grunau <janne-ffmpeg@jannau.net>2010-11-04 21:00:01 +0000
commitbbdee6e5f9dc50d805dd383464f73413f968c31f (patch)
tree2fef3144cfa2138cdf138dea463dc6ea95c466c5
parent146b6555449bc055cc2500b885119143ffd9f440 (diff)
downloadffmpeg-bbdee6e5f9dc50d805dd383464f73413f968c31f.tar.gz
aacdec: consume the audio specific config during LATM parsing
Spotted by Alex after Carl Eugen found errors some samples. There no errors or noticeable artifacts in the samples I used during development. Originally committed as revision 25676 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/aacdec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 607b906e26..ab3a49aff7 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -2155,6 +2155,8 @@ static int latm_decode_audio_specific_config(struct LATMContext *latmctx,
avctx->extradata_size = esize;
memcpy(avctx->extradata, gb->buffer + (config_start_bit/8), esize);
memset(avctx->extradata+esize, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+
+ skip_bits_long(gb, bits_consumed);
}
return bits_consumed;