From 236f79480b15df8996455168742d141bbf578df2 Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Mon, 27 Sep 2010 21:48:06 +0000 Subject: [PATCH] merge #if with if() Originally committed as revision 25233 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavfilter/vf_yadif.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c index 86b97444cd..9e700f9d5b 100644 --- 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);