summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2014-07-27 17:01:53 +0000
committerAnton Khirnov <anton@khirnov.net>2014-08-09 16:13:11 +0000
commit4d1ff2a489f4c60501b1a6a2d1f3874e61a77df9 (patch)
treee9d0a317d7f25fb46f8267cd7d862b9e106adcda
parentd35b94fbabd8beb5d566c0b5d01688aff62c3b36 (diff)
hevc: calculate the dbf strength in hls_pcm_sample() only if dbf is enabled
-rw-r--r--libavcodec/hevc.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 20d28782a7..3bd26eb06e 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -1448,9 +1448,11 @@ static int hls_pcm_sample(HEVCContext *s, int x0, int y0, int log2_cb_size)
const uint8_t *pcm = skip_bytes(&lc->cc, (length + 7) >> 3);
int ret;
- ff_hevc_deblocking_boundary_strengths(s, x0, y0, log2_cb_size,
- lc->slice_or_tiles_up_boundary,
- lc->slice_or_tiles_left_boundary);
+ if (!s->sh.disable_deblocking_filter_flag) {
+ ff_hevc_deblocking_boundary_strengths(s, x0, y0, log2_cb_size,
+ lc->slice_or_tiles_up_boundary,
+ lc->slice_or_tiles_left_boundary);
+ }
ret = init_get_bits(&gb, pcm, length);
if (ret < 0)