Commit fa6f4ebc authored by Aurelien Jacobs's avatar Aurelien Jacobs

use a Makefile in x86 subdir

Originally committed as revision 25234 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 236f7948
...@@ -39,14 +39,14 @@ OBJS-$(CONFIG_UNSHARP_FILTER) += vf_unsharp.o ...@@ -39,14 +39,14 @@ OBJS-$(CONFIG_UNSHARP_FILTER) += vf_unsharp.o
OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o
OBJS-$(CONFIG_YADIF_FILTER) += vf_yadif.o OBJS-$(CONFIG_YADIF_FILTER) += vf_yadif.o
OBJS-$(ARCH_X86) += x86/yadif.o
OBJS-$(CONFIG_BUFFER_FILTER) += vsrc_buffer.o OBJS-$(CONFIG_BUFFER_FILTER) += vsrc_buffer.o
OBJS-$(CONFIG_COLOR_FILTER) += vf_pad.o OBJS-$(CONFIG_COLOR_FILTER) += vf_pad.o
OBJS-$(CONFIG_NULLSRC_FILTER) += vsrc_nullsrc.o OBJS-$(CONFIG_NULLSRC_FILTER) += vsrc_nullsrc.o
OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o
-include $(SUBDIR)$(ARCH)/Makefile
DIRS = x86 DIRS = x86
include $(SUBDIR)../subdir.mak include $(SUBDIR)../subdir.mak
MMX-OBJS-$(CONFIG_YADIF_FILTER) += x86/yadif.o
...@@ -22,8 +22,6 @@ ...@@ -22,8 +22,6 @@
#include "libavutil/x86_cpu.h" #include "libavutil/x86_cpu.h"
#include "libavfilter/yadif.h" #include "libavfilter/yadif.h"
#if HAVE_MMX
#define LOAD4(mem,dst) \ #define LOAD4(mem,dst) \
"movd "mem", "#dst" \n\t"\ "movd "mem", "#dst" \n\t"\
"punpcklbw %%mm7, "#dst" \n\t" "punpcklbw %%mm7, "#dst" \n\t"
...@@ -236,5 +234,3 @@ void ff_yadif_filter_line_mmx(uint8_t *dst, ...@@ -236,5 +234,3 @@ void ff_yadif_filter_line_mmx(uint8_t *dst,
#undef CHECK1 #undef CHECK1
#undef CHECK2 #undef CHECK2
#undef FILTER #undef FILTER
#endif /* HAVE_MMX */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment