aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Grunau <janne-libav@jannau.net>2011-10-21 17:13:03 +0200
committerJanne Grunau <janne-libav@jannau.net>2011-10-25 12:08:21 +0200
commit785f876cee7b55fe54007da00759a8f1cf81db36 (patch)
treeb9bf06e67ced68eec43eeeff4823a1f2f649abc5
parent80e36425fb25a53f89b735d00ff3e7c293a9472c (diff)
downloadffmpeg-785f876cee7b55fe54007da00759a8f1cf81db36.tar.gz
latm: avoid unnecessary reinit of the aac decoder
-rw-r--r--libavcodec/aacdec.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index d1774a1f98..6000fe190b 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -2509,8 +2509,9 @@ static int latm_decode_frame(AVCodecContext *avctx, void *out, int *out_size,
*out_size = 0;
return avpkt->size;
} else {
- aac_decode_close(avctx);
- if ((err = aac_decode_init(avctx)) < 0)
+ if ((err = decode_audio_specific_config(
+ &latmctx->aac_ctx, avctx, &latmctx->aac_ctx.m4ac,
+ avctx->extradata, avctx->extradata_size)) < 0)
return err;
latmctx->initialized = 1;
}