[FFmpeg-cvslog] r25234 - in trunk/libavfilter: Makefile x86/Makefile x86/yadif.c

[aurel]

Author: aurel
Date: Mon Sep 27 23:50:26 2010
New Revision: 25234

Log:
use a Makefile in x86 subdir

Added:
   trunk/libavfilter/x86/Makefile
Modified:
   trunk/libavfilter/Makefile
   trunk/libavfilter/x86/yadif.c

Modified: trunk/libavfilter/Makefile
==============================================================================
--- trunk/libavfilter/Makefile	Mon Sep 27 23:48:06 2010	(r25233)
+++ trunk/libavfilter/Makefile	Mon Sep 27 23:50:26 2010	(r25234)
@@ -39,14 +39,14 @@ OBJS-$(CONFIG_UNSHARP_FILTER)           
 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

Added: trunk/libavfilter/x86/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/libavfilter/x86/Makefile	Mon Sep 27 23:50:26 2010	(r25234)
@@ -0,0 +1 @@
+MMX-OBJS-$(CONFIG_YADIF_FILTER)              += x86/yadif.o

Modified: trunk/libavfilter/x86/yadif.c
==============================================================================
--- trunk/libavfilter/x86/yadif.c	Mon Sep 27 23:48:06 2010	(r25233)
+++ trunk/libavfilter/x86/yadif.c	Mon Sep 27 23:50:26 2010	(r25234)
@@ -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 *d
 #undef CHECK1
 #undef CHECK2
 #undef FILTER
-
-#endif /* HAVE_MMX */