Remove unneeded reset of non_zero_count_cache for deblock.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@21414 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavcodec/h264.h

@@ -960,11 +960,7 @@ static av_always_inline int fill_caches(H264Context *h, int mb_type, int for_deb
             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]=
 
@@ -973,8 +969,6 @@ static av_always_inline int fill_caches(H264Context *h, int mb_type, int for_deb
             *(uint32_t*)&h->non_zero_count_cache[4+8*0]= CABAC && !IS_INTRA(mb_type) ? 0 : 0x40404040;
     }
 
-    }
-
     for (i=0; i<2; i++) {
         if(left_type[i]){
             h->non_zero_count_cache[3+8*1 + 2*8*i]= h->non_zero_count[left_xy[i]][left_block[8+0+2*i]];
@@ -983,18 +977,13 @@ static av_always_inline int fill_caches(H264Context *h, int mb_type, int for_deb
                 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;
         }
     }
-    }
 
     // CAVLC 8x8dct requires NNZ values for residual decoding that differ from what the loop filter needs
     if(for_deblock && !CABAC && h->pps.transform_8x8_mode){