diff options
| author | Clément Bœsch <cboesch@gopro.com> | 2017-01-11 17:12:37 +0100 |
|---|---|---|
| committer | Clément Bœsch <cboesch@gopro.com> | 2017-01-16 10:43:41 +0100 |
| commit | bd520e85690183f73bdcd298100b22d58d6b205d (patch) | |
| tree | c66e2bdc867ee6367dc4eb2a7e0d321a56e2698b /libavcodec | |
| parent | a91c265f393b72925dc440f79b3ec4ec7aba575f (diff) | |
| download | ffmpeg-bd520e85690183f73bdcd298100b22d58d6b205d.tar.gz | |
lavc/h264_slice: drop redundant current_slice reset
It is done unconditionally in ff_h264_field_end()
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264_slice.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 9a334a97cb..2dc98c109c 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; |