[FFmpeg-cvslog] lavc/h264_slice: drop redundant current_slice reset
Clément Bœsch
git at videolan.org
Mon Jan 16 11:43:21 EET 2017
ffmpeg | branch: master | Clément Bœsch <cboesch at gopro.com> | Wed Jan 11 17:12:37 2017 +0100| [bd520e85690183f73bdcd298100b22d58d6b205d] | committer: Clément Bœsch
lavc/h264_slice: drop redundant current_slice reset
It is done unconditionally in ff_h264_field_end()
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bd520e85690183f73bdcd298100b22d58d6b205d
---
libavcodec/h264_slice.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 9a334a9..2dc98c1 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -1797,13 +1797,11 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl,
if (h->cur_pic_ptr && FIELD_PICTURE(h) && h->first_field) {
ret = ff_h264_field_end(h, h->slice_ctx, 1);
- h->current_slice = 0;
if (ret < 0)
return ret;
} else if (h->cur_pic_ptr && !FIELD_PICTURE(h) && !h->first_field && h->nal_unit_type == H264_NAL_IDR_SLICE) {
av_log(h, AV_LOG_WARNING, "Broken frame packetizing\n");
ret = ff_h264_field_end(h, h->slice_ctx, 1);
- h->current_slice = 0;
ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, 0);
ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, 1);
h->cur_pic_ptr = NULL;
More information about the ffmpeg-cvslog
mailing list