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

[michael]

Author: michael
Date: Sat Feb 13 21:13:10 2010
New Revision: 21811

Log:
Skiped MBs dont need the cbp stuff so skip initing that.

Modified:
   trunk/libavcodec/h264.h

Modified: trunk/libavcodec/h264.h
==============================================================================
--- trunk/libavcodec/h264.h	Sat Feb 13 20:59:53 2010	(r21810)
+++ trunk/libavcodec/h264.h	Sat Feb 13 21:13:10 2010	(r21811)
@@ -801,6 +801,7 @@ static void fill_decode_caches(H264Conte
         left_type[0] = h->slice_table[left_xy[0] ] == h->slice_num ? s->current_picture.mb_type[left_xy[0]] : 0;
         left_type[1] = h->slice_table[left_xy[1] ] == h->slice_num ? s->current_picture.mb_type[left_xy[1]] : 0;
 
+    if(!IS_SKIP(mb_type)){
         if(IS_INTRA(mb_type)){
             int type_mask= h->pps.constrained_intra_pred ? IS_INTRA(-1) : -1;
             h->topleft_samples_available=
@@ -945,6 +946,7 @@ static void fill_decode_caches(H264Conte
             h->left_cbp |= ((h->cbp_table[left_xy[1]]>>((left_block[2]&(~1))+1))&0x1) << 3;
         }
     }
+    }
 
 #if 1
     if(IS_INTER(mb_type) || (IS_DIRECT(mb_type) && h->direct_spatial_mv_pred)){