diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-11-04 09:37:00 -0500 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-11-11 11:26:02 +0100 |
| commit | 898e9a24ef13d8c56b4abf4ee0af09cdb0343e2d (patch) | |
| tree | 5d6e351710fb8e9f471710602a83b0a29f2fdaec /libavcodec/mpegvideo.c | |
| parent | fe27aeaeab07142b1acd2690c64ee6973bdd7eba (diff) | |
| download | ffmpeg-898e9a24ef13d8c56b4abf4ee0af09cdb0343e2d.tar.gz | |
mpegvideo: check mpv return value
CC: libav-stable@libav.org
Bug-Id: CID 1238786
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index c60389bd87..da9f24f36f 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -908,6 +908,7 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst, // FIXME can parameters change on I-frames? // in that case dst may need a reinit if (!s->context_initialized) { + int err; memcpy(s, s1, sizeof(MpegEncContext)); s->avctx = dst; @@ -915,7 +916,8 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst, s->bitstream_buffer_size = s->allocated_bitstream_buffer_size = 0; ff_mpv_idct_init(s); - ff_mpv_common_init(s); + if ((err = ff_mpv_common_init(s)) < 0) + return err; } if (s->height != s1->height || s->width != s1->width || s->context_reinit) { |