Browse code

use a Makefile in x86 subdir

Originally committed as revision 25234 to svn://svn.ffmpeg.org/ffmpeg/trunk

Aurelien Jacobs authored on 2010/09/28 06:50:26
Showing 3 changed files
... ...
@@ -39,14 +39,14 @@ OBJS-$(CONFIG_UNSHARP_FILTER)                += vf_unsharp.o
39 39
 OBJS-$(CONFIG_VFLIP_FILTER)                  += vf_vflip.o
40 40
 OBJS-$(CONFIG_YADIF_FILTER)                  += vf_yadif.o
41 41
 
42
-OBJS-$(ARCH_X86) += x86/yadif.o
43
-
44 42
 OBJS-$(CONFIG_BUFFER_FILTER)                 += vsrc_buffer.o
45 43
 OBJS-$(CONFIG_COLOR_FILTER)                  += vf_pad.o
46 44
 OBJS-$(CONFIG_NULLSRC_FILTER)                += vsrc_nullsrc.o
47 45
 
48 46
 OBJS-$(CONFIG_NULLSINK_FILTER)               += vsink_nullsink.o
49 47
 
48
+-include $(SUBDIR)$(ARCH)/Makefile
49
+
50 50
 DIRS = x86
51 51
 
52 52
 include $(SUBDIR)../subdir.mak
53 53
new file mode 100644
... ...
@@ -0,0 +1 @@
0
+MMX-OBJS-$(CONFIG_YADIF_FILTER)              += x86/yadif.o
... ...
@@ -22,8 +22,6 @@
22 22
 #include "libavutil/x86_cpu.h"
23 23
 #include "libavfilter/yadif.h"
24 24
 
25
-#if HAVE_MMX
26
-
27 25
 #define LOAD4(mem,dst) \
28 26
             "movd      "mem", "#dst" \n\t"\
29 27
             "punpcklbw %%mm7, "#dst" \n\t"
... ...
@@ -236,5 +234,3 @@ void ff_yadif_filter_line_mmx(uint8_t *dst,
236 236
 #undef CHECK1
237 237
 #undef CHECK2
238 238
 #undef FILTER
239
-
240
-#endif /* HAVE_MMX */