use a Makefile in x86 subdir

Originally committed as revision 25234 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago · fa6f4ebc08
parent 236f79480b
commit fa6f4ebc08
3 changed files with 3 additions and 6 deletions
--- 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
--- a/libavfilter/x86/Makefile
+++ b/libavfilter/x86/Makefile
@ -0,0 +1 @@
+MMX-OBJS-$(CONFIG_YADIF_FILTER)              += x86/yadif.o
--- 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 */
				`@ -0,0 +1 @@`
				`MMX-OBJS-$(CONFIG_YADIF_FILTER) += x86/yadif.o`