RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '898e9a24ef13d8c56b4abf4ee0af09cdb0343e2d' 

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

Conflicts:
	libavcodec/mpegvideo.c

See: f4d73f0fb5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-11 21:20:50 +01:00
parent aeb1621d1f 898e9a24ef
commit 9311026ec7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/mpegvideo.c
View File

@ -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,
// 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;
} }
} }
} }