Mercurial > libavcodec.hg

changeset 11158:81c3f88f460f libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Skiped MBs dont need the cbp stuff so skip initing that.
author michael
date Sat, 13 Feb 2010 20:13:10 +0000
parents 625a076b8038
children 2d5a3c03c219
files h264.h
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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)){