Merge commit '898e9a24ef13d8c56b4abf4ee0af09cdb0343e2d'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Nov 2014 20:20:50 +0000 (21:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Nov 2014 20:22:09 +0000 (21:22 +0100)
* commit '898e9a24ef13d8c56b4abf4ee0af09cdb0343e2d':
  mpegvideo: check mpv return value

Conflicts:
libavcodec/mpegvideo.c

See: f4d73f0fb55e0b5931c859ddb4d2d1617b60d560
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/mpegvideo.c

@@@ -962,16 -915,9 +963,16 @@@ int ff_mpeg_update_thread_context(AVCod
          s->bitstream_buffer      = NULL;
          s->bitstream_buffer_size = s->allocated_bitstream_buffer_size = 0;
  
 -        ff_mpv_idct_init(s);
 -        if ((err = ff_mpv_common_init(s)) < 0)
 -            return err;
 +        if (s1->context_initialized){
 +//             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;
 +            }
 +        }
      }
  
      if (s->height != s1->height || s->width != s1->width || s->context_reinit) {