Mercurial > libavcodec.hg
comparison h264.h @ 11296:4709312b48d5 libavcodec
Remove useless check of the 2 left MBs of a pair being in the same slice.
author | michael |
---|---|
date | Fri, 26 Feb 2010 01:38:12 +0000 |
parents | fb7e2f568ad9 |
children | b5836ef8e74e |
comparison
equal
deleted
inserted
replaced
11295:8fd2622aa522 | 11296:4709312b48d5 |
---|---|
858 if(!(left_type[1] & type_mask)){ | 858 if(!(left_type[1] & type_mask)){ |
859 h->topleft_samples_available&= 0xFF5F; | 859 h->topleft_samples_available&= 0xFF5F; |
860 h->left_samples_available&= 0xFF5F; | 860 h->left_samples_available&= 0xFF5F; |
861 } | 861 } |
862 }else{ | 862 }else{ |
863 int left_typei = h->slice_table[left_xy[0] + s->mb_stride ] == h->slice_num | 863 int left_typei = s->current_picture.mb_type[left_xy[0] + s->mb_stride]; |
864 ? s->current_picture.mb_type[left_xy[0] + s->mb_stride] : 0; | 864 |
865 assert(left_xy[0] == left_xy[1]); | 865 assert(left_xy[0] == left_xy[1]); |
866 if(!((left_typei & type_mask) && (left_type[0] & type_mask))){ | 866 if(!((left_typei & type_mask) && (left_type[0] & type_mask))){ |
867 h->topleft_samples_available&= 0xDF5F; | 867 h->topleft_samples_available&= 0xDF5F; |
868 h->left_samples_available&= 0x5F5F; | 868 h->left_samples_available&= 0x5F5F; |
869 } | 869 } |