aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-12-15 01:24:04 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-12-15 01:24:04 +0000
commit40f06241213a430a8f2ab65a98b280cb96c30fa1 (patch)
treed0c74054ad76f020e595c482f16005f929d66163
parentbf73801bec57fafbf160ee10d072d64b8bb510ba (diff)
downloadffmpeg-40f06241213a430a8f2ab65a98b280cb96c30fa1.tar.gz
Enable filter_mb_fast if CODEC_FLAG2_FAST is set.
Originally committed as revision 16141 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/h264.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 7d57cd8d26..e623faab5b 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -6119,7 +6119,7 @@ static void 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 ||
-1 ||
+ !(s->flags2 & CODEC_FLAG2_FAST) || //FIXME filter_mb_fast is broken, thus hasto be, but should not under CODEC_FLAG2_FAST
(h->deblocking_filter == 2 && (h->slice_table[mb_xy] != h->slice_table[h->top_mb_xy] ||
h->slice_table[mb_xy] != h->slice_table[mb_xy - 1]))) {
filter_mb(h, mb_x, mb_y, img_y, img_cb, img_cr, linesize, uvlinesize);