aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <clement@stupeflix.com>2016-06-20 15:38:11 +0200
committerClément Bœsch <clement@stupeflix.com>2016-06-20 15:38:11 +0200
commit0528410e04929d72ca29e5afddcc90d88de7208d (patch)
treeefe3275790693f87ec48ffbd829333709a4ccc3d
parentfabdb7505a7b8b8bb15c2f3b652a4fb03a8dd6f3 (diff)
parent4fd34e639d15b44e02686c9b4ef58c9c3c9b0a69 (diff)
downloadffmpeg-0528410e04929d72ca29e5afddcc90d88de7208d.tar.gz
Merge commit '4fd34e639d15b44e02686c9b4ef58c9c3c9b0a69'
* commit '4fd34e639d15b44e02686c9b4ef58c9c3c9b0a69': h264: remove pointless setting of some variables in loop_filter Merged-by: Clément Bœsch <clement@stupeflix.com>
-rw-r--r--libavcodec/h264_slice.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 4f62b74146..d1d74d6d97 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 =