projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
80e3642
)
latm: avoid unnecessary reinit of the aac decoder
author
Janne Grunau
<janne-libav@jannau.net>
Fri, 21 Oct 2011 15:13:03 +0000
(17:13 +0200)
committer
Janne Grunau
<janne-libav@jannau.net>
Tue, 25 Oct 2011 10:08:21 +0000
(12:08 +0200)
libavcodec/aacdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/aacdec.c
b/libavcodec/aacdec.c
index
d1774a1
..
6000fe1
100644
(file)
--- 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;
}