merge #if with if()

Originally committed as revision 25233 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c
index 86b97444cd132b2a7caae732e212a0b0ce3e63d4..9e700f9d5bc772238796e4c2ac993e5f4ee4bdaa 100644 (file)
--- a/libavfilter/vf_yadif.c
+++ b/libavfilter/vf_yadif.c
@@ -294,10 +294,8 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
     if (args) sscanf(args, "%d:%d", &yadif->mode, &yadif->parity);
 
     yadif->filter_line = filter_line_c;
-#if HAVE_MMX
-    if (cpu_flags & AV_CPU_FLAG_MMX)
+    if (HAVE_MMX && cpu_flags & AV_CPU_FLAG_MMX)
         yadif->filter_line = ff_yadif_filter_line_mmx;
-#endif
 
     av_log(ctx, AV_LOG_INFO, "mode:%d parity:%d\n", yadif->mode, yadif->parity);