summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavcodec/h264.c4
-rw-r--r--libavcodec/h264.h1
-rw-r--r--libavcodec/h264_picture.c1
-rw-r--r--libavcodec/h264_slice.c1
4 files changed, 2 insertions, 5 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 00984297c5..bf82500ca2 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -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);
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index c595dde99f..6eb27d75ac 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -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;
/**
diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c
index d9d2a25839..14a96d0e3d 100644
--- a/libavcodec/h264_picture.c
+++ b/libavcodec/h264_picture.c
@@ -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) {
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 3313cc34ec..096bc0d24e 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -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;