summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-05-21 20:21:55 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-05-21 21:19:43 +0200
commitfaa2930f191099621e03c55cca32662467d3cc15 (patch)
tree1abc71e00145915365cdbf4489149265cff8c67b /libavcodec
parenta6f650af8d864abbf248fd423e900a4754cfca6e (diff)
flvdec: reenable extradata passing code
This fixes passing junk in stream. It should not have any user vissible effect. We are discarding the new data in the decoder as no case is known where it is needed but it causes problems if used. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/aacdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index b002f14583..d4f48bb791 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -2556,7 +2556,7 @@ static int aac_decode_frame(AVCodecContext *avctx, void *data,
AV_PKT_DATA_NEW_EXTRADATA,
&new_extradata_size);
- if (new_extradata) {
+ if (new_extradata && 0) {
av_free(avctx->extradata);
avctx->extradata = av_mallocz(new_extradata_size +
FF_INPUT_BUFFER_PADDING_SIZE);