diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-01-18 16:29:16 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-01-18 16:29:16 +0000 |
| commit | 42ebca85514bd38347d145cf049c92db69d8644f (patch) | |
| tree | e1afbd7d438c8d84e65ba2c54101885ceb5018d5 | |
| parent | a8f49215955f100b9436c74c7b4faab368dfc795 (diff) | |
| download | ffmpeg-42ebca85514bd38347d145cf049c92db69d8644f.tar.gz | |
PAFF CABAC P slices seem to work as well, so enable them for ff_h264_filter_mb_fast() too.
Originally committed as revision 21289 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -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 56b1c17c95..27cc97d0e2 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 && !FIELD_PICTURE) || + (CABAC && 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]))) { |