diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2010-09-27 21:50:26 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-09-27 21:50:26 +0000 |
| commit | fa6f4ebc08d228ce9795f1f4178d68e31407aeb9 (patch) | |
| tree | d7c9445176b727e5a2e45a61f49e12beb7afefe5 /libavfilter | |
| parent | 236f79480b15df8996455168742d141bbf578df2 (diff) | |
| download | ffmpeg-fa6f4ebc08d228ce9795f1f4178d68e31407aeb9.tar.gz | |
use a Makefile in x86 subdir
Originally committed as revision 25234 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/Makefile | 4 | ||||
| -rw-r--r-- | libavfilter/x86/Makefile | 1 | ||||
| -rw-r--r-- | libavfilter/x86/yadif.c | 4 |
3 files changed, 3 insertions, 6 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 51fe208a4e..6d73bf205b 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 0000000000..716048cca2 --- /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 e92da8c1d6..55340cff80 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 */ |