summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-01-28 02:41:52 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-01-28 02:41:52 +0000
commit3b84924516f649a7f2b144830e98c6537aa70faf (patch)
tree278a5f7464942856e3a2cbd32511dbb703532ed6
parentb6302d0c55bbc087ec11081b837618ed740101a6 (diff)
Simplify first edge filter condition.
Originally committed as revision 21497 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/h264_loopfilter.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/h264_loopfilter.c b/libavcodec/h264_loopfilter.c
index 233f0c9950..bf997c847f 100644
--- a/libavcodec/h264_loopfilter.c
+++ b/libavcodec/h264_loopfilter.c
@@ -440,9 +440,7 @@ static av_always_inline void filter_mb_dir(H264Context *h, int mb_x, int mb_y, u
// how often to recheck mv-based bS when iterating along each edge
const int mask_par0 = mb_type & (MB_TYPE_16x16 | (MB_TYPE_8x16 >> dir));
- if(!(h->slice_table[mbm_xy] == 0xFFFF
- || first_vertical_edge_done
- || (h->deblocking_filter==2 && h->slice_table[mbm_xy] != h->slice_num))){
+ if(mbm_type && !first_vertical_edge_done){
if (FRAME_MBAFF && (dir == 1) && ((mb_y&1) == 0)
&& IS_INTERLACED(mbm_type&~mb_type)