diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-17 00:44:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-17 00:44:32 +0200 |
| commit | e99f324c143a2d825b2be260cb6a799dbfe97a10 (patch) | |
| tree | ab05a337bab6dc0813445ece7bab027250d53ef0 /libavformat | |
| parent | 6c655b40eaceb77a8f4a8f32775db969935de746 (diff) | |
| parent | 58c95448e42d34910b939363949ba1a92c06b0b0 (diff) | |
| download | ffmpeg-e99f324c143a2d825b2be260cb6a799dbfe97a10.tar.gz | |
Merge commit '58c95448e42d34910b939363949ba1a92c06b0b0'
* commit '58c95448e42d34910b939363949ba1a92c06b0b0':
smacker: pad the extradata allocation
Conflicts:
libavformat/smacker.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/smacker.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/smacker.c b/libavformat/smacker.c index e04a214ff3..7132a85565 100644 --- a/libavformat/smacker.c +++ b/libavformat/smacker.c @@ -210,7 +210,8 @@ static int smacker_read_header(AVFormatContext *s) /* load trees to extradata, they will be unpacked by decoder */ - st->codec->extradata = av_malloc(smk->treesize + 16 + FF_INPUT_BUFFER_PADDING_SIZE); + st->codec->extradata = av_mallocz(smk->treesize + 16 + + FF_INPUT_BUFFER_PADDING_SIZE); st->codec->extradata_size = smk->treesize + 16; if(!st->codec->extradata){ av_log(s, AV_LOG_ERROR, "Cannot allocate %i bytes of extradata\n", smk->treesize + 16); |