From: Clément Bœsch <cboesch@gopro.com>
Date: Wed, 11 Jan 2017 16:12:37 +0000 (+0100)
Subject: lavc/h264_slice: drop redundant current_slice reset
X-Git-Tag: android-x86-7.1-r1~2442
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bd520e85690183f73bdcd298100b22d58d6b205d;p=android-x86%2Fexternal-ffmpeg.git

lavc/h264_slice: drop redundant current_slice reset

It is done unconditionally in ff_h264_field_end()
---

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;