summaryrefslogtreecommitdiff
path: root/libavcodec/hevc_filter.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2014-07-28 01:06:32 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-28 14:20:19 +0200
commita5c621aa852522c79146035b2db4b89d2e096d3c (patch)
tree4e0cba792cf9349b16da5b8149d099084227fadb /libavcodec/hevc_filter.c
parente0492311c8541da55a4b08641364ce8e1a169740 (diff)
hevc: rename variable in boundary strength to b more explicit
Signed-off-by: Mickaƫl Raulet <mraulet@insa-rennes.fr> cherry picked from commit 348bebedc0012aae201419669fca1eb61ec93ca6 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc_filter.c')
-rw-r--r--libavcodec/hevc_filter.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c
index a68d843429..bf471cea3c 100644
--- a/libavcodec/hevc_filter.c
+++ b/libavcodec/hevc_filter.c
@@ -585,9 +585,9 @@ void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0,
if (y0 > 0 && (y0 & 7) == 0) {
int bd_ctby = y0 & ((1 << s->sps->log2_ctb_size) - 1);
int bd_slice = s->sh.slice_loop_filter_across_slices_enabled_flag ||
- !(lc->slice_or_tiles_up_boundary & 1);
+ !(lc->boundary_flags & BOUNDARY_UPPER_SLICE);
int bd_tiles = s->pps->loop_filter_across_tiles_enabled_flag ||
- !(lc->slice_or_tiles_up_boundary & 2);
+ !(lc->boundary_flags & BOUNDARY_UPPER_TILE);
if (((bd_slice && bd_tiles) || bd_ctby)) {
int yp_pu = (y0 - 1) >> log2_min_pu_size;
int yq_pu = y0 >> log2_min_pu_size;
@@ -619,9 +619,9 @@ void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0,
if (x0 > 0 && (x0 & 7) == 0) {
int bd_ctbx = x0 & ((1 << s->sps->log2_ctb_size) - 1);
int bd_slice = s->sh.slice_loop_filter_across_slices_enabled_flag ||
- !(lc->slice_or_tiles_left_boundary & 1);
+ !(lc->boundary_flags & BOUNDARY_LEFT_SLICE);
int bd_tiles = s->pps->loop_filter_across_tiles_enabled_flag ||
- !(lc->slice_or_tiles_left_boundary & 2);
+ !(lc->boundary_flags & BOUNDARY_LEFT_TILE);
if (((bd_slice && bd_tiles) || bd_ctbx)) {
int xp_pu = (x0 - 1) >> log2_min_pu_size;
int xq_pu = x0 >> log2_min_pu_size;