From 82313eaa34b02cf1a4b6f55c1b73549ec8d056f0 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 MB_MBAFF macro. This way it does not look like a constant. --- libavcodec/h264_cavlc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libavcodec/h264_cavlc.c') diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index be7d2e9698..424165fece 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -856,7 +856,7 @@ decode_intra_mb: } for(list=0; listlist_count; list++){ - int ref_count = IS_REF0(mb_type) ? 1 : h->ref_count[list] << MB_MBAFF; + int ref_count = IS_REF0(mb_type) ? 1 : h->ref_count[list] << MB_MBAFF(h); for(i=0; i<4; i++){ if(IS_DIRECT(h->sub_mb_type[i])) continue; if(IS_DIR(h->sub_mb_type[i], 0, list)){ @@ -936,7 +936,7 @@ decode_intra_mb: for(list=0; listlist_count; list++){ unsigned int val; if(IS_DIR(mb_type, 0, list)){ - int rc = h->ref_count[list] << MB_MBAFF; + int rc = h->ref_count[list] << MB_MBAFF(h); if (rc == 1) { val= 0; } else if (rc == 2) { @@ -967,7 +967,7 @@ decode_intra_mb: for(i=0; i<2; i++){ unsigned int val; if(IS_DIR(mb_type, i, list)){ - int rc = h->ref_count[list] << MB_MBAFF; + int rc = h->ref_count[list] << MB_MBAFF(h); if (rc == 1) { val= 0; } else if (rc == 2) { @@ -1005,7 +1005,7 @@ decode_intra_mb: for(i=0; i<2; i++){ unsigned int val; if(IS_DIR(mb_type, i, list)){ //FIXME optimize - int rc = h->ref_count[list] << MB_MBAFF; + int rc = h->ref_count[list] << MB_MBAFF(h); if (rc == 1) { val= 0; } else if (rc == 2) { -- cgit v1.2.3