Merge commit 'a097f0049b28dc3ed13625e4a42619292c92492f'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 00:27:53 +0000 (01:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 00:33:17 +0000 (01:33 +0100)
* commit 'a097f0049b28dc3ed13625e4a42619292c92492f':
  mpeg12dec: move first_slice from MpegEncContext to Mpeg1Context

Conflicts:
libavcodec/mpeg12dec.c

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

@@@ -52,7 -51,8 +52,8 @@@ typedef struct Mpeg1Context 
      int save_width, save_height, save_progressive_seq;
      AVRational frame_rate_ext;       ///< MPEG-2 specific framerate modificator
      int sync;                        ///< Did we reach a sync point like a GOP/SEQ/KEYFrame?
 -    int closed_gop;                  ///< GOP is closed
 +    int tmpgexs;
+     int first_slice;
      int extradata_decoded;
  } Mpeg1Context;
  
@@@ -1955,7 -1882,7 +1956,7 @@@ FF_ENABLE_DEPRECATION_WARNING
  #endif /* FF_API_XVMC */
  
      /* end of slice reached */
-     if (/*s->mb_y << field_pic == s->mb_height &&*/ !s->first_field && !s->first_slice) {
 -    if (/*s->mb_y << field_pic == s->mb_height &&*/ !s->first_field) {
++    if (/*s->mb_y << field_pic == s->mb_height &&*/ !s->first_field && !s1->first_slice) {
          /* end of image */
  
          ff_er_frame_end(&s->er);
Simple merge