Merge commit '066aafced4dc6c7c9e7b37082635472249f1e93e'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 13:38:59 +0000 (14:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 13:38:59 +0000 (14:38 +0100)
* commit '066aafced4dc6c7c9e7b37082635472249f1e93e':
  h264: move direct_spatial_mv_pred into the per-slice context

Conflicts:
libavcodec/h264_mvpred.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/dxva2_h264.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_direct.c
libavcodec/h264_mvpred.h
libavcodec/h264_slice.c
libavcodec/vaapi_h264.c

Simple merge
@@@ -1306,11 -1269,8 +1306,11 @@@ int ff_set_ref_count(H264Context *h, H2
      ref_count[1] = h->pps.ref_count[1];
  
      if (sl->slice_type_nos != AV_PICTURE_TYPE_I) {
 +        unsigned max[2];
 +        max[0] = max[1] = h->picture_structure == PICT_FRAME ? 15 : 31;
 +
          if (sl->slice_type_nos == AV_PICTURE_TYPE_B)
-             h->direct_spatial_mv_pred = get_bits1(&h->gb);
+             sl->direct_spatial_mv_pred = get_bits1(&h->gb);
          num_ref_idx_active_override_flag = get_bits1(&h->gb);
  
          if (num_ref_idx_active_override_flag) {
Simple merge
Simple merge
@@@ -613,7 -613,7 +613,7 @@@ static void fill_decode_caches(H264Cont
              int16_t(*mv)[2]       = h->cur_pic.motion_val[list];
              if (!USES_LIST(mb_type, list))
                  continue;
-             av_assert2(!(IS_DIRECT(mb_type) && !h->direct_spatial_mv_pred));
 -            assert(!(IS_DIRECT(mb_type) && !sl->direct_spatial_mv_pred));
++            av_assert2(!(IS_DIRECT(mb_type) && !sl->direct_spatial_mv_pred));
  
              if (USES_LIST(top_type, list)) {
                  const int b_xy = h->mb2b_xy[top_xy] + 3 * b_stride;
Simple merge
Simple merge