Merge commit '370ddc7b'

* commit '370ddc7b':
  h264: remove H264Context.pict_type
Merged-by: Clément Bœsch <clement@stupeflix.com>

libavcodec/h264.c

@@ -491,8 +491,6 @@ static void decode_postinit(H264Context *h, int setup_finished)
     H264Picture *cur = h->cur_pic_ptr;
     int i, pics, out_of_order, out_idx;
 
-    h->cur_pic_ptr->f->pict_type = h->pict_type;
-
     if (h->next_output_pic)
         return;
 

libavcodec/h264.h

@@ -627,8 +627,6 @@ typedef struct H264Context {
      */
     int single_decode_warning;
 
-    enum AVPictureType pict_type;
-
     /** @} */
 
     /**

libavcodec/h264_slice.c

@@ -499,6 +499,8 @@ static int h264_frame_start(H264Context *h)
     pic->invalid_gap = 0;
     pic->sei_recovery_frame_cnt = h->sei.recovery_point.recovery_frame_cnt;
 
+    pic->f->pict_type = h->slice_ctx[0].slice_type;
+
     if ((ret = alloc_picture(h, pic)) < 0)
         return ret;
     if(!h->frame_recovered && !h->avctx->hwaccel
@@ -1140,10 +1142,6 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl)
         }
     }
 
-    // to make a few old functions happy, it's wrong though
-    if (!h->setup_finished)
-        h->pict_type = sl->slice_type;
-
     pps_id = get_ue_golomb(&sl->gb);
     if (pps_id >= MAX_PPS_COUNT) {
         av_log(h->avctx, AV_LOG_ERROR, "pps_id %u out of range\n", pps_id);