diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-11 21:20:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-11 21:22:09 +0100 |
| commit | 9311026ec7a082c7ff9efff7a0d28e4d9832af6d (patch) | |
| tree | 0e212cce5208d225f9d1672eee0a81dd92ab6d36 /libavcodec | |
| parent | aeb1621d1f173fc59eb52781caa6c7437e657b1b (diff) | |
| parent | 898e9a24ef13d8c56b4abf4ee0af09cdb0343e2d (diff) | |
| download | ffmpeg-9311026ec7a082c7ff9efff7a0d28e4d9832af6d.tar.gz | |
Merge commit '898e9a24ef13d8c56b4abf4ee0af09cdb0343e2d'
* commit '898e9a24ef13d8c56b4abf4ee0af09cdb0343e2d':
mpegvideo: check mpv return value
Conflicts:
libavcodec/mpegvideo.c
See: f4d73f0fb55e0b5931c859ddb4d2d1617b60d560
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegvideo.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index f043bbdace..f84557b4d3 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -956,6 +956,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; @@ -966,10 +967,10 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst, // s->picture_range_start += MAX_PICTURE_COUNT; // s->picture_range_end += MAX_PICTURE_COUNT; ff_mpv_idct_init(s); - if((ret = ff_mpv_common_init(s)) < 0){ + if((err = ff_mpv_common_init(s)) < 0){ memset(s, 0, sizeof(MpegEncContext)); s->avctx = dst; - return ret; + return err; } } } |