From 6d2b6f21eb45ffbda1103c772060303648714832 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 9 Mar 2013 20:37:11 +0100 Subject: h264: add a parameter to the CABAC macro. This way it does not look like a constant. --- libavcodec/h264_cabac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec/h264_cabac.c') diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 8cd60dcf23..ece7bbcfe0 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -25,7 +25,7 @@ * @author Michael Niedermayer */ -#define CABAC 1 +#define CABAC(h) 1 #include "config.h" #include "cabac.h" @@ -2303,7 +2303,7 @@ decode_intra_mb: } } if (h->top_type && !IS_8x8DCT(h->top_type)){ - uint32_t top_empty = CABAC && !IS_INTRA(mb_type) ? 0 : 0x40404040; + uint32_t top_empty = CABAC(h) && !IS_INTRA(mb_type) ? 0 : 0x40404040; AV_WN32A(&nnz_cache[4+8* 0], top_empty); AV_WN32A(&nnz_cache[4+8* 5], top_empty); AV_WN32A(&nnz_cache[4+8*10], top_empty); -- cgit v1.2.3