[FFmpeg-cvslog] h264: drop H264Context.ouputed_poc
Anton Khirnov
git at videolan.org
Wed Apr 29 11:46:02 CEST 2015
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun Apr 5 08:49:47 2015 +0200| [9d33bab583a82cf12286c65258a29c6888e1ff98] | committer: Anton Khirnov
h264: drop H264Context.ouputed_poc
It is only set, but never used for anything.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9d33bab583a82cf12286c65258a29c6888e1ff98
---
libavcodec/h264.c | 4 ++--
libavcodec/h264.h | 1 -
libavcodec/h264_picture.c | 1 -
libavcodec/h264_slice.c | 1 -
4 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 266b3ec..5c67655 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -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)
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index fc2ee4b..821b609 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -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;
/**
diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c
index 0263e6e..814599d 100644
--- a/libavcodec/h264_picture.c
+++ b/libavcodec/h264_picture.c
@@ -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) {
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index d5c0a6f..d5b99ae 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -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;
More information about the ffmpeg-cvslog
mailing list