Commit 2e4362af authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

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

Originally committed as revision 21811 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 65760304
......@@ -801,6 +801,7 @@ static void fill_decode_caches(H264Context *h, int mb_type){
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(H264Context *h, int mb_type){
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)){
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment