diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-01-19 16:43:57 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-01-19 16:43:57 +0000 |
| commit | 655a1d57d591645ec8fab24cc4f16b396dd94a6c (patch) | |
| tree | 9585e278b9b72e71d20259a481d23fe40db33e7d | |
| parent | 9ac4548ff7e57bee6f47d1826208cdd626ca45d7 (diff) | |
| download | ffmpeg-655a1d57d591645ec8fab24cc4f16b396dd94a6c.tar.gz | |
Reenable ff_h264_filter_mb_fast() for all slices it supported before.
Originally committed as revision 21328 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h264_loopfilter.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/h264_loopfilter.c b/libavcodec/h264_loopfilter.c index 2ae3fd9a4a..d50384fb80 100644 --- a/libavcodec/h264_loopfilter.c +++ b/libavcodec/h264_loopfilter.c @@ -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); |