# HG changeset patch # User michael # Date 1266091990 0 # Node ID 81c3f88f460fe2637b9aec9588edf1f42a3bcb6b # Parent 625a076b803844b54d96244b1c08a3b730fd21aa Skiped MBs dont need the cbp stuff so skip initing that. diff -r 625a076b8038 -r 81c3f88f460f h264.h --- a/h264.h Sat Feb 13 19:59:53 2010 +0000 +++ b/h264.h Sat Feb 13 20:13:10 2010 +0000 @@ -801,6 +801,7 @@ 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 @@ 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)){