[FFmpeg-cvslog] r21414 - trunk/libavcodec/h264.h

[michael]

Author: michael
Date: Sat Jan 23 23:11:46 2010
New Revision: 21414

Log:
Remove unneeded reset of non_zero_count_cache for deblock.

Modified:
   trunk/libavcodec/h264.h

Modified: trunk/libavcodec/h264.h
==============================================================================
--- trunk/libavcodec/h264.h	Sat Jan 23 22:57:36 2010	(r21413)
+++ trunk/libavcodec/h264.h	Sat Jan 23 23:11:46 2010	(r21414)
@@ -960,19 +960,13 @@ static av_always_inline int fill_caches(
             h->non_zero_count_cache[1+8*3]= h->non_zero_count[top_xy][1+2*8];
             h->non_zero_count_cache[2+8*3]= h->non_zero_count[top_xy][2+2*8];
         }
-    }else{
-        if(for_deblock){
-            *(uint32_t*)&h->non_zero_count_cache[4+8*0]= 0;
-        }else{
-
+    }else if(!for_deblock){
             h->non_zero_count_cache[1+8*0]=
             h->non_zero_count_cache[2+8*0]=
 
             h->non_zero_count_cache[1+8*3]=
             h->non_zero_count_cache[2+8*3]=
             *(uint32_t*)&h->non_zero_count_cache[4+8*0]= CABAC && !IS_INTRA(mb_type) ? 0 : 0x40404040;
-        }
-
     }
 
     for (i=0; i<2; i++) {
@@ -983,16 +977,11 @@ static av_always_inline int fill_caches(
                 h->non_zero_count_cache[0+8*1 +   8*i]= h->non_zero_count[left_xy[i]][left_block[8+4+2*i]];
                 h->non_zero_count_cache[0+8*4 +   8*i]= h->non_zero_count[left_xy[i]][left_block[8+5+2*i]];
             }
-        }else{
-            if(for_deblock){
-                h->non_zero_count_cache[3+8*1 + 2*8*i]=
-                h->non_zero_count_cache[3+8*2 + 2*8*i]= 0;
-            }else{
+        }else if(!for_deblock){
                 h->non_zero_count_cache[3+8*1 + 2*8*i]=
                 h->non_zero_count_cache[3+8*2 + 2*8*i]=
                 h->non_zero_count_cache[0+8*1 +   8*i]=
                 h->non_zero_count_cache[0+8*4 +   8*i]= CABAC && !IS_INTRA(mb_type) ? 0 : 64;
-            }
         }
     }