From e7226984ac13aacb84eae77a372df8ff7685848f Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 17 Jan 2015 22:28:46 +0100 Subject: h264: move [{top,left}_]cbp 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 0bc43dbd81..5176e54e33 100644 --- a/libavcodec/h264_mb.c +++ b/libavcodec/h264_mb.c @@ -763,7 +763,7 @@ static av_always_inline void hl_decode_mb_idct_luma(H264Context *h, H264SliceCon linesize, sl->non_zero_count_cache + p * 5 * 8); } - } else if (h->cbp & 15) { + } else if (sl->cbp & 15) { if (transform_bypass) { const int di = IS_8x8DCT(mb_type) ? 4 : 1; idct_add = IS_8x8DCT(mb_type) ? h->h264dsp.h264_add_pixels8_clear -- cgit v1.2.3