From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 24 Jan 2010 13:43:26 +0000 (+0000)
Subject: Prefer cbp over cbp_table.
X-Git-Tag: v0.6~1690
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b2b7ab32aae6f3f5dd4d6908371b494febc1d2df;p=platform%2Fupstream%2Flibav.git

Prefer cbp over cbp_table.

Originally committed as revision 21418 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index e09bf72..b791558 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -1004,16 +1004,16 @@ static av_always_inline int fill_caches(H264Context *h, int mb_type, int for_deb
 
         if(IS_8x8DCT(mb_type)){
             h->non_zero_count_cache[scan8[0   ]]= h->non_zero_count_cache[scan8[1   ]]=
-            h->non_zero_count_cache[scan8[2   ]]= h->non_zero_count_cache[scan8[3   ]]= h->cbp_table[mb_xy] & 1;
+            h->non_zero_count_cache[scan8[2   ]]= h->non_zero_count_cache[scan8[3   ]]= h->cbp & 1;
 
             h->non_zero_count_cache[scan8[0+ 4]]= h->non_zero_count_cache[scan8[1+ 4]]=
-            h->non_zero_count_cache[scan8[2+ 4]]= h->non_zero_count_cache[scan8[3+ 4]]= h->cbp_table[mb_xy] & 2;
+            h->non_zero_count_cache[scan8[2+ 4]]= h->non_zero_count_cache[scan8[3+ 4]]= h->cbp & 2;
 
             h->non_zero_count_cache[scan8[0+ 8]]= h->non_zero_count_cache[scan8[1+ 8]]=
-            h->non_zero_count_cache[scan8[2+ 8]]= h->non_zero_count_cache[scan8[3+ 8]]= h->cbp_table[mb_xy] & 4;
+            h->non_zero_count_cache[scan8[2+ 8]]= h->non_zero_count_cache[scan8[3+ 8]]= h->cbp & 4;
 
             h->non_zero_count_cache[scan8[0+12]]= h->non_zero_count_cache[scan8[1+12]]=
-            h->non_zero_count_cache[scan8[2+12]]= h->non_zero_count_cache[scan8[3+12]]= h->cbp_table[mb_xy] & 8;
+            h->non_zero_count_cache[scan8[2+12]]= h->non_zero_count_cache[scan8[3+12]]= h->cbp & 8;
         }
     }