[FFmpeg-cvslog] r25233 - trunk/libavfilter/vf_yadif.c

[aurel]

Author: aurel
Date: Mon Sep 27 23:48:06 2010
New Revision: 25233

Log:
merge #if with if()

Modified:
   trunk/libavfilter/vf_yadif.c

Modified: trunk/libavfilter/vf_yadif.c
==============================================================================
--- trunk/libavfilter/vf_yadif.c	Mon Sep 27 23:31:29 2010	(r25232)
+++ trunk/libavfilter/vf_yadif.c	Mon Sep 27 23:48:06 2010	(r25233)
@@ -294,10 +294,8 @@ static av_cold int init(AVFilterContext 
     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);