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>
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_picture.c
libavcodec/h264_slice.c

index 0098429..bf82500 100644 (file)
@@ -629,7 +629,7 @@ static int h264_init_context(AVCodecContext *avctx, H264Context *h)
     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;
 
@@ -1066,7 +1066,7 @@ void ff_h264_flush_change(H264Context *h)
 {
     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);
 
index c595dde..6eb27d7 100644 (file)
@@ -645,7 +645,6 @@ typedef struct H264Context {
     H264Picture *delayed_pic[MAX_DELAYED_PIC_COUNT + 2]; // FIXME size?
     int last_pocs[MAX_DELAYED_PIC_COUNT];
     H264Picture *next_output_pic;
-    int outputed_poc;
     int next_outputed_poc;
 
     /**
index d9d2a25..14a96d0 100644 (file)
@@ -169,7 +169,6 @@ int ff_h264_field_end(H264Context *h, H264SliceContext *sl, int in_setup)
         }
         h->prev_frame_num_offset = h->frame_num_offset;
         h->prev_frame_num        = h->frame_num;
-        h->outputed_poc          = h->next_outputed_poc;
     }
 
     if (avctx->hwaccel) {
index 3313cc3..096bc0d 100644 (file)
@@ -636,7 +636,6 @@ int ff_h264_update_thread_context(AVCodecContext *dst,
     }
     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;