Commit 8f8497ae authored by Michael Niedermayer's avatar Michael Niedermayer

Remove useless check of the 2 left MBs of a pair being in the same slice.

Originally committed as revision 22069 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent f57a5dcd
...@@ -860,8 +860,8 @@ static void fill_decode_caches(H264Context *h, int mb_type){ ...@@ -860,8 +860,8 @@ static void fill_decode_caches(H264Context *h, int mb_type){
h->left_samples_available&= 0xFF5F; h->left_samples_available&= 0xFF5F;
} }
}else{ }else{
int left_typei = h->slice_table[left_xy[0] + s->mb_stride ] == h->slice_num int left_typei = s->current_picture.mb_type[left_xy[0] + s->mb_stride];
? s->current_picture.mb_type[left_xy[0] + s->mb_stride] : 0;
assert(left_xy[0] == left_xy[1]); assert(left_xy[0] == left_xy[1]);
if(!((left_typei & type_mask) && (left_type[0] & type_mask))){ if(!((left_typei & type_mask) && (left_type[0] & type_mask))){
h->topleft_samples_available&= 0xDF5F; h->topleft_samples_available&= 0xDF5F;
......
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