[SCM] libav/experimental: hevc: calculate the dbf strength in hls_pcm_sample() only if dbf is enabled

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 4d1ff2a489f4c60501b1a6a2d1f3874e61a77df9
Author: Anton Khirnov <anton at khirnov.net>
Date:   Sun Jul 27 17:01:53 2014 +0000

    hevc: calculate the dbf strength in hls_pcm_sample() only if dbf is enabled

diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 20d2878..3bd26eb 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)

-- 
Libav/FFmpeg packaging