Merge commit 'bc98e8c0e0a8babfea35c98855e366b29cbe1191'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 16:30:59 +0000 (17:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 17:03:54 +0000 (18:03 +0100)
* commit 'bc98e8c0e0a8babfea35c98855e366b29cbe1191':
  h264: move mb_field_decoding_flag into the per-slice context

Conflicts:
libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c
libavcodec/h264_mb.c
libavcodec/h264_mb_template.c
libavcodec/h264_mvpred.h
libavcodec/h264_slice.c

@@@ -90,8 -74,7 +90,8 @@@ static void h264_er_decode_mb(void *opa
      fill_rectangle(&sl->ref_cache[0][scan8[0]], 4, 4, 8, ref, 1);
      fill_rectangle(sl->mv_cache[0][scan8[0]], 4, 4, 8,
                     pack16to32((*mv)[0][0][0], (*mv)[0][0][1]), 4);
 -    assert(!FRAME_MBAFF(h));
 +    h->mb_mbaff =
-     h->mb_field_decoding_flag = 0;
++    sl->mb_field_decoding_flag = 0;
      ff_h264_hl_decode_mb(h, &h->slice_ctx[0]);
  }
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1548,14 -1390,7 +1548,14 @@@ int ff_h264_decode_slice_header(H264Con
                     h0->current_slice + 1);
              return AVERROR_INVALIDDATA;
          }
 -    } else {
 +    }
 +
 +    h->picture_structure = picture_structure;
 +    h->droppable         = droppable;
 +    h->frame_num         = frame_num;
-     h->mb_field_decoding_flag = picture_structure != PICT_FRAME;
++    sl->mb_field_decoding_flag = picture_structure != PICT_FRAME;
 +
 +    if (h0->current_slice == 0) {
          /* Shorten frame num gaps so we don't have to allocate reference
           * frames just to throw them away */
          if (h->frame_num != h->prev_frame_num) {