Reenable ff_h264_filter_mb_fast() for all slices it supported before.
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Jan 2010 16:43:57 +0000 (16:43 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Jan 2010 16:43:57 +0000 (16:43 +0000)
Originally committed as revision 21328 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/h264_loopfilter.c

index 2ae3fd9..d50384f 100644 (file)
@@ -320,9 +320,6 @@ void ff_h264_filter_mb_fast( H264Context *h, int mb_x, int mb_y, uint8_t *img_y,
     mb_xy = h->mb_xy;
 
     if(mb_x==0 || mb_y==mb_y_firstrow || !s->dsp.h264_loop_filter_strength || h->pps.chroma_qp_diff ||
-       !(h->slice_type_nos == FF_I_TYPE ||
-         h->slice_type_nos == FF_P_TYPE ||
-         (s->flags2 & CODEC_FLAG2_FAST)) ||
        (h->deblocking_filter == 2 && (h->slice_num != h->slice_table[h->top_mb_xy] ||
                                       h->slice_num != h->slice_table[mb_xy - 1]))) {
         ff_h264_filter_mb(h, mb_x, mb_y, img_y, img_cb, img_cr, linesize, uvlinesize);