[SCM] libav/experimental: hevc_filter: drop redundant checks

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 65b8b6c476454d201348737527a1d9471f689278
Author: Anton Khirnov <anton at khirnov.net>
Date:   Sun Jul 27 17:06:19 2014 +0000

    hevc_filter: drop redundant checks
    
    ff_hevc_deblocking_boundary_strengths() is never called if the
    deblocking filter is disabled for the slice.

diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c
index eb5594c..14be963 100644
--- a/libavcodec/hevc_filter.c
+++ b/libavcodec/hevc_filter.c
@@ -623,7 +623,7 @@ void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0,
                      (slice_or_tiles_up_boundary & 2) &&
                      (y0 % (1 << s->sps->log2_ctb_size)) == 0)
                 bs = 0;
-            if (y0 == 0 || s->sh.disable_deblocking_filter_flag == 1)
+            if (y0 == 0)
                 bs = 0;
             if (bs)
                 s->horizontal_bs[((x0 + i) + y0 * s->bs_width) >> 2] = bs;
@@ -651,8 +651,6 @@ void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0,
 
                 bs = boundary_strength(s, curr, curr_cbf_luma,
                                        top, top_cbf_luma, top_refPicList, 0);
-                if (s->sh.disable_deblocking_filter_flag == 1)
-                    bs = 0;
                 if (bs)
                     s->horizontal_bs[((x0 + i) + (y0 + j) * s->bs_width) >> 2] = bs;
             }
@@ -686,7 +684,7 @@ void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0,
                      (slice_or_tiles_left_boundary & 2) &&
                      (x0 % (1 << s->sps->log2_ctb_size)) == 0)
                 bs = 0;
-            if (x0 == 0 || s->sh.disable_deblocking_filter_flag == 1)
+            if (x0 == 0)
                 bs = 0;
             if (bs)
                 s->vertical_bs[(x0 >> 3) + ((y0 + i) >> 2) * s->bs_width] = bs;
@@ -714,8 +712,6 @@ void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0,
 
                 bs = boundary_strength(s, curr, curr_cbf_luma,
                                        left, left_cbf_luma, left_refPicList, 0);
-                if (s->sh.disable_deblocking_filter_flag == 1)
-                    bs = 0;
                 if (bs)
                     s->vertical_bs[((x0 + i) >> 3) + ((y0 + j) >> 2) * s->bs_width] = bs;
             }

-- 
Libav/FFmpeg packaging