Merge commit '9951907f6fc37a8d41566dbee09f7c15ff587de6'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 15:07:53 +0000 (16:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 15:07:53 +0000 (16:07 +0100)
* commit '9951907f6fc37a8d41566dbee09f7c15ff587de6':
  h264: move redundant_pic_count into the per-slice context

Conflicts:
libavcodec/h264.c

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

@@@ -275,9 -275,9 +275,9 @@@ static void fill_slice_long(AVCodecCont
              }
          }
      }
 -    slice->slice_qs_delta    = 0; /* XXX not implemented by Libav */
 +    slice->slice_qs_delta    = 0; /* XXX not implemented by FFmpeg */
      slice->slice_qp_delta    = sl->qscale - h->pps.init_qp;
-     slice->redundant_pic_cnt = h->redundant_pic_count;
+     slice->redundant_pic_cnt = sl->redundant_pic_count;
      if (sl->slice_type == AV_PICTURE_TYPE_B)
          slice->direct_spatial_mv_pred_flag = sl->direct_spatial_mv_pred;
      slice->cabac_init_idc = h->pps.cabac ? sl->cabac_init_idc : 0;
@@@ -1624,12 -1568,16 +1624,12 @@@ again
                      if (h->avctx->hwaccel &&
                          (ret = h->avctx->hwaccel->start_frame(h->avctx, NULL, 0)) < 0)
                          return ret;
 +                    if (CONFIG_H264_VDPAU_DECODER &&
 +                        h->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
 +                        ff_vdpau_h264_picture_start(h);
                  }
  
-                 if (hx->redundant_pic_count == 0) {
 -                if (sl->redundant_pic_count == 0 &&
 -                    (avctx->skip_frame < AVDISCARD_NONREF ||
 -                     hx->nal_ref_idc) &&
 -                    (avctx->skip_frame < AVDISCARD_BIDIR  ||
 -                     sl->slice_type_nos != AV_PICTURE_TYPE_B) &&
 -                    (avctx->skip_frame < AVDISCARD_NONKEY ||
 -                     sl->slice_type_nos == AV_PICTURE_TYPE_I) &&
 -                    avctx->skip_frame < AVDISCARD_ALL) {
++                if (sl->redundant_pic_count == 0) {
                      if (avctx->hwaccel) {
                          ret = avctx->hwaccel->decode_slice(avctx,
                                                             &buf[buf_index - consumed],
Simple merge
Simple merge