mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-25 16:52:31 +00:00
Merge commit 'd256ed78ffe202a4dcc8d625becffc716bfa3977'
* commit 'd256ed78ffe202a4dcc8d625becffc716bfa3977': 4xm: allocate extradata properly. Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
6a51090924
@ -110,8 +110,11 @@ static int parse_vtrk(AVFormatContext *s,
|
||||
|
||||
st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
|
||||
st->codec->codec_id = AV_CODEC_ID_4XM;
|
||||
|
||||
st->codec->extradata = av_mallocz(4 + FF_INPUT_BUFFER_PADDING_SIZE);
|
||||
if (!st->codec->extradata)
|
||||
return AVERROR(ENOMEM);
|
||||
st->codec->extradata_size = 4;
|
||||
st->codec->extradata = av_malloc(4);
|
||||
AV_WL32(st->codec->extradata, AV_RL32(buf + 16));
|
||||
st->codec->width = AV_RL32(buf + 36);
|
||||
st->codec->height = AV_RL32(buf + 40);
|
||||
|
Loading…
Reference in New Issue
Block a user