Commit e99f324c authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '58c95448'

* commit '58c95448':
  smacker: pad the extradata allocation

Conflicts:
	libavformat/smacker.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 6c655b40 58c95448
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment