[SCM] libav/experimental: use a Makefile in x86 subdir

[siretart at users.alioth.debian.org]

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

    use a Makefile in x86 subdir
    
    Originally committed as revision 25234 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 51fe208..6d73bf2 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -39,14 +39,14 @@ OBJS-$(CONFIG_UNSHARP_FILTER)                += vf_unsharp.o
 OBJS-$(CONFIG_VFLIP_FILTER)                  += vf_vflip.o
 OBJS-$(CONFIG_YADIF_FILTER)                  += vf_yadif.o
 
-OBJS-$(ARCH_X86) += x86/yadif.o
-
 OBJS-$(CONFIG_BUFFER_FILTER)                 += vsrc_buffer.o
 OBJS-$(CONFIG_COLOR_FILTER)                  += vf_pad.o
 OBJS-$(CONFIG_NULLSRC_FILTER)                += vsrc_nullsrc.o
 
 OBJS-$(CONFIG_NULLSINK_FILTER)               += vsink_nullsink.o
 
+-include $(SUBDIR)$(ARCH)/Makefile
+
 DIRS = x86
 
 include $(SUBDIR)../subdir.mak
diff --git a/libavfilter/x86/Makefile b/libavfilter/x86/Makefile
new file mode 100644
index 0000000..716048c
--- /dev/null
+++ b/libavfilter/x86/Makefile
@@ -0,0 +1 @@
+MMX-OBJS-$(CONFIG_YADIF_FILTER)              += x86/yadif.o
diff --git a/libavfilter/x86/yadif.c b/libavfilter/x86/yadif.c
index e92da8c..55340cf 100644
--- a/libavfilter/x86/yadif.c
+++ b/libavfilter/x86/yadif.c
@@ -22,8 +22,6 @@
 #include "libavutil/x86_cpu.h"
 #include "libavfilter/yadif.h"
 
-#if HAVE_MMX
-
 #define LOAD4(mem,dst) \
             "movd      "mem", "#dst" \n\t"\
             "punpcklbw %%mm7, "#dst" \n\t"
@@ -236,5 +234,3 @@ void ff_yadif_filter_line_mmx(uint8_t *dst,
 #undef CHECK1
 #undef CHECK2
 #undef FILTER
-
-#endif /* HAVE_MMX */

-- 
Libav/FFmpeg packaging