[SCM] libav/experimental: merge #if with if()

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 236f79480b15df8996455168742d141bbf578df2
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Mon Sep 27 21:48:06 2010 +0000

    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 86b9744..9e700f9 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);
 

-- 
Libav/FFmpeg packaging