Merge commit '03eb55741427c6608f63972c105e565ca0ba4f15'
* commit '03eb55741427c6608f63972c105e565ca0ba4f15':
wmv2enc: Check memory allocation
Conflicts:
libavcodec/wmv2enc.c
See: 6e8fe44815
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
commit
59b009411f
@ -65,6 +65,7 @@ static av_cold int wmv2_encode_init(AVCodecContext *avctx)
|
||||
avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
|
||||
if (!avctx->extradata)
|
||||
return AVERROR(ENOMEM);
|
||||
|
||||
encode_ext_header(w);
|
||||
|
||||
return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user