Commit 9311026e authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '898e9a24'

* commit '898e9a24':
  mpegvideo: check mpv return value

Conflicts:
	libavcodec/mpegvideo.c

See: f4d73f0fMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents aeb1621d 898e9a24
...@@ -956,6 +956,7 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst, ...@@ -956,6 +956,7 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst,
// FIXME can parameters change on I-frames? // FIXME can parameters change on I-frames?
// in that case dst may need a reinit // in that case dst may need a reinit
if (!s->context_initialized) { if (!s->context_initialized) {
int err;
memcpy(s, s1, sizeof(MpegEncContext)); memcpy(s, s1, sizeof(MpegEncContext));
s->avctx = dst; s->avctx = dst;
...@@ -966,10 +967,10 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst, ...@@ -966,10 +967,10 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst,
// s->picture_range_start += MAX_PICTURE_COUNT; // s->picture_range_start += MAX_PICTURE_COUNT;
// s->picture_range_end += MAX_PICTURE_COUNT; // s->picture_range_end += MAX_PICTURE_COUNT;
ff_mpv_idct_init(s); 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)); memset(s, 0, sizeof(MpegEncContext));
s->avctx = dst; s->avctx = dst;
return ret; return err;
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment