From e6c90ce94f1b07f50cea2babf7471af455cca0ff Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Sat, 17 Jan 2015 22:28:46 +0100
Subject: h264: move loopfilter parameters into the per-slice context

---
 libavcodec/h264_mb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libavcodec/h264_mb.c')

diff --git a/libavcodec/h264_mb.c b/libavcodec/h264_mb.c
index 5176e54e33..d29e2c632f 100644
--- a/libavcodec/h264_mb.c
+++ b/libavcodec/h264_mb.c
@@ -523,7 +523,7 @@ static av_always_inline void xchg_mb_border(H264Context *h, H264SliceContext *sl
         }
     }
 
-    if (h->deblocking_filter == 2) {
+    if (sl->deblocking_filter == 2) {
         deblock_topleft = h->slice_table[h->mb_xy - 1 - h->mb_stride] == sl->slice_num;
         deblock_top     = sl->top_type;
     } else {
-- 
cgit v1.2.3