From fa6f4ebc08d228ce9795f1f4178d68e31407aeb9 Mon Sep 17 00:00:00 2001
From: Aurelien Jacobs <aurel@gnuage.org>
Date: Mon, 27 Sep 2010 21:50:26 +0000
Subject: [PATCH] use a Makefile in x86 subdir
Originally committed as revision 25234 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavfilter/Makefile | 4 ++--
libavfilter/x86/Makefile | 1 +
libavfilter/x86/yadif.c | 4 ----
3 files changed, 3 insertions(+), 6 deletions(-)
create mode 100644 libavfilter/x86/Makefile
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 51fe208a4e4..6d73bf205bc 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 00000000000..716048cca2a
--- /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 e92da8c1d60..55340cff801 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 */
--
GitLab