Merge commit '9d33bab583a82cf12286c65258a29c6888e1ff98'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 09:38:42 +0000 (11:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 09:38:42 +0000 (11:38 +0200)
* commit '9d33bab583a82cf12286c65258a29c6888e1ff98':
  h264: drop H264Context.ouputed_poc

Conflicts:
libavcodec/h264.c

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

@@@ -626,10 -597,8 +626,10 @@@ static int h264_init_context(AVCodecCon
      h->x264_build            = -1;
      h->recovery_frame        = -1;
      h->frame_recovered       = 0;
 +    h->prev_frame_num        = -1;
 +    h->sei_fpa.frame_packing_arrangement_cancel_flag = -1;
  
-     h->outputed_poc = h->next_outputed_poc = INT_MIN;
+     h->next_outputed_poc = INT_MIN;
      for (i = 0; i < MAX_DELAYED_PIC_COUNT; i++)
          h->last_pocs[i] = INT_MIN;
  
@@@ -1064,22 -1044,14 +1064,22 @@@ static void idr(H264Context *h
  /* forget old pics after a seek */
  void ff_h264_flush_change(H264Context *h)
  {
 -    int i;
 -    for (i = 0; i < MAX_DELAYED_PIC_COUNT; i++)
 -        h->last_pocs[i] = INT_MIN;
 +    int i, j;
 +
-     h->outputed_poc          = h->next_outputed_poc = INT_MIN;
+     h->next_outputed_poc = INT_MIN;
      h->prev_interlaced_frame = 1;
      idr(h);
 -    if (h->cur_pic_ptr)
 +
 +    h->prev_frame_num = -1;
 +    if (h->cur_pic_ptr) {
          h->cur_pic_ptr->reference = 0;
 +        for (j=i=0; h->delayed_pic[i]; i++)
 +            if (h->delayed_pic[i] != h->cur_pic_ptr)
 +                h->delayed_pic[j++] = h->delayed_pic[i];
 +        h->delayed_pic[j] = NULL;
 +    }
 +    ff_h264_unref_picture(h, &h->last_pic_for_ec);
 +
      h->first_field = 0;
      ff_h264_reset_sei(h);
      h->recovery_frame = -1;
Simple merge
Simple merge
@@@ -636,9 -583,9 +636,8 @@@ int ff_h264_update_thread_context(AVCod
      }
      h->prev_frame_num_offset = h->frame_num_offset;
      h->prev_frame_num        = h->frame_num;
-     h->outputed_poc          = h->next_outputed_poc;
  
      h->recovery_frame        = h1->recovery_frame;
 -    h->frame_recovered       = h1->frame_recovered;
  
      return err;
  }