diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-01-18 19:45:56 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-01-18 19:45:56 +0000 |
| commit | bce6a1e7c78f27f40b8ee2a9ca6c88b5db4c8386 (patch) | |
| tree | 7a9de87d87e205672eb609b03d56bbb477612dd1 /libavcodec | |
| parent | 439d6b1dcf01e31ff3c839a8611502d17407120a (diff) | |
| download | ffmpeg-bce6a1e7c78f27f40b8ee2a9ca6c88b5db4c8386.tar.gz | |
Enable filter_mb_fast for CAVLC P slices.
Originally committed as revision 21291 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264_loopfilter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_loopfilter.c b/libavcodec/h264_loopfilter.c index 27cc97d0e2..c7b4431297 100644 --- a/libavcodec/h264_loopfilter.c +++ b/libavcodec/h264_loopfilter.c @@ -335,7 +335,7 @@ void ff_h264_filter_mb_fast( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, 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 || - (CABAC && h->slice_type_nos == FF_P_TYPE) || + h->slice_type_nos == FF_P_TYPE || (s->flags2 & CODEC_FLAG2_FAST)) || (h->deblocking_filter == 2 && (h->slice_table[mb_xy] != h->slice_table[h->top_mb_xy] || //use slice_num h->slice_table[mb_xy] != h->slice_table[mb_xy - 1]))) { |