OSDN Git Service

h264: drop H264Context.ouputed_poc
authorAnton Khirnov <anton@khirnov.net>
Sun, 5 Apr 2015 06:49:47 +0000 (08:49 +0200)
committerAnton Khirnov <anton@khirnov.net>
Wed, 29 Apr 2015 03:52:57 +0000 (05:52 +0200)
It is only set, but never used for anything.

libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_picture.c
libavcodec/h264_slice.c

index 266b3ec..5c67655 100644 (file)
@@ -598,7 +598,7 @@ static int h264_init_context(AVCodecContext *avctx, H264Context *h)
     h->recovery_frame        = -1;
     h->frame_recovered       = 0;
 
-    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;
 
@@ -1047,7 +1047,7 @@ void ff_h264_flush_change(H264Context *h)
     int i;
     for (i = 0; i < MAX_DELAYED_PIC_COUNT; i++)
         h->last_pocs[i] = INT_MIN;
-    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)
index fc2ee4b..821b609 100644 (file)
@@ -602,7 +602,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 0263e6e..814599d 100644 (file)
@@ -161,7 +161,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 d5c0a6f..d5b99ae 100644 (file)
@@ -583,7 +583,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;
     h->frame_recovered       = h1->frame_recovered;