diff options
author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-12-17 16:02:10 +0100 |
---|---|---|
committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-01-06 16:43:54 +0100 |
commit | 1c6183233d56fb27a4a154e7e64ecab98bd877f1 (patch) | |
tree | 9fe3d4d1dff0cbaba74af2d9503cafc7a487fbc4 /libavcodec/mpegvideo_enc.c | |
parent | ed97963bdbf3bb17fca4f9ea0aa1a97722dec907 (diff) |
msmpeg4: check memory allocations and propagate errors
Bug-Id: CID 1257781
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
-rw-r--r-- | libavcodec/mpegvideo_enc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 8abbcf529b..535978de6f 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -760,7 +760,8 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) if (CONFIG_H263_ENCODER && s->out_format == FMT_H263) ff_h263_encode_init(s); if (CONFIG_MSMPEG4_ENCODER && s->msmpeg4_version) - ff_msmpeg4_encode_init(s); + if ((ret = ff_msmpeg4_encode_init(s)) < 0) + return ret; if ((CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER) && s->out_format == FMT_MPEG1) ff_mpeg1_encode_init(s); |