[FFmpeg-cvslog] Merge commit '4fd34e639d15b44e02686c9b4ef58c9c3c9b0a69'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Mon Jun 20 15:38:11 2016 +0200| [0528410e04929d72ca29e5afddcc90d88de7208d] | committer: Clément Bœsch

Merge commit '4fd34e639d15b44e02686c9b4ef58c9c3c9b0a69'

* commit '4fd34e639d15b44e02686c9b4ef58c9c3c9b0a69':
  h264: remove pointless setting of some variables in loop_filter

Merged-by: Clément Bœsch <clement at stupeflix.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0528410e04929d72ca29e5afddcc90d88de7208d
---

 libavcodec/h264_slice.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 4f62b74..d1d74d6 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -2086,9 +2086,7 @@ static void loop_filter(const H264Context *h, H264SliceContext *sl, int start_x,
             for (mb_y = end_mb_y - FRAME_MBAFF(h); mb_y <= end_mb_y; mb_y++) {
                 int mb_xy, mb_type;
                 mb_xy         = sl->mb_xy = mb_x + mb_y * h->mb_stride;
-                sl->slice_num = h->slice_table[mb_xy];
                 mb_type       = h->cur_pic.mb_type[mb_xy];
-                sl->list_count = h->list_counts[mb_xy];
 
                 if (FRAME_MBAFF(h))
                     sl->mb_mbaff               =


======================================================================