From 07c5ca551b7327d3c4e33738cc0cd2d5ac2779fa 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 is_complex 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 d29e2c632f..09d31ecfaf 100644
--- a/libavcodec/h264_mb.c
+++ b/libavcodec/h264_mb.c
@@ -814,7 +814,7 @@ void ff_h264_hl_decode_mb(H264Context *h, H264SliceContext *sl)
 {
     const int mb_xy   = h->mb_xy;
     const int mb_type = h->cur_pic.mb_type[mb_xy];
-    int is_complex    = CONFIG_SMALL || h->is_complex ||
+    int is_complex    = CONFIG_SMALL || sl->is_complex ||
                         IS_INTRA_PCM(mb_type) || sl->qscale == 0;
 
     if (CHROMA444(h)) {
-- 
cgit v1.2.3