OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
50f7054
)
aacenc: Properly pad extradata.
author
Alex Converse
<alex.converse@gmail.com>
Mon, 28 Jun 2010 21:34:57 +0000
(21:34 +0000)
committer
Alex Converse
<alex.converse@gmail.com>
Mon, 28 Jun 2010 21:34:57 +0000
(21:34 +0000)
This fixes a valgrind error when encoding to ADTS.
Originally committed as revision 23866 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/aacenc.c
patch
|
blob
|
history
diff --git
a/libavcodec/aacenc.c
b/libavcodec/aacenc.c
index
8c913e0
..
6d66c66
100644
(file)
--- a/
libavcodec/aacenc.c
+++ b/
libavcodec/aacenc.c
@@
-191,7
+191,7
@@
static av_cold int aac_encode_init(AVCodecContext *avctx)
s->samples = av_malloc(2 * 1024 * avctx->channels * sizeof(s->samples[0]));
s->cpe = av_mallocz(sizeof(ChannelElement) * aac_chan_configs[avctx->channels-1][0]);
- avctx->extradata = av_malloc
(2
);
+ avctx->extradata = av_malloc
z(2 + FF_INPUT_BUFFER_PADDING_SIZE
);
avctx->extradata_size = 2;
put_audio_specific_config(avctx);