diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-02-26 01:38:12 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-02-26 01:38:12 +0000 |
| commit | 8f8497ae78e226f779eebcf545c5fe93d31e82d4 (patch) | |
| tree | e331e1528a4276826a0f6b6ce29df337b7061376 /libavcodec/h264.h | |
| parent | f57a5dcd4ea6e9ef2288812f45b91f4edbe3eaa2 (diff) | |
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
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index d21b16e4da..8754d0d601 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -860,8 +860,8 @@ static void fill_decode_caches(H264Context *h, int mb_type){ h->left_samples_available&= 0xFF5F; } }else{ - int left_typei = h->slice_table[left_xy[0] + s->mb_stride ] == h->slice_num - ? s->current_picture.mb_type[left_xy[0] + s->mb_stride] : 0; + int left_typei = s->current_picture.mb_type[left_xy[0] + s->mb_stride]; + assert(left_xy[0] == left_xy[1]); if(!((left_typei & type_mask) && (left_type[0] & type_mask))){ h->topleft_samples_available&= 0xDF5F; |