Commit e3ea3582 authored by diego's avatar diego

Handle conditional compilation of CPU-specific FFT code in the Makefile.

Also replace one coarse MMX condition with more fine-grained
3DNow!/3DNowExt!/SSE conditions.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@17409 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent a3b27554
...@@ -908,7 +908,6 @@ HAVE_LIST=" ...@@ -908,7 +908,6 @@ HAVE_LIST="
# options emitted with CONFIG_ prefix but not available on command line # options emitted with CONFIG_ prefix but not available on command line
CONFIG_EXTRA=" CONFIG_EXTRA="
fft_mmx
oldscaler oldscaler
" "
...@@ -976,8 +975,6 @@ ssse3_deps="sse" ...@@ -976,8 +975,6 @@ ssse3_deps="sse"
vis_deps="sparc" vis_deps="sparc"
# common features # common features
fft_suggest="fft_mmx"
fft_mmx_deps="mmx yasm"
oldscaler_deps="!swscale" oldscaler_deps="!swscale"
# decoders / encoders # decoders / encoders
......
...@@ -402,6 +402,12 @@ OBJS-$(HAVE_PTHREADS) += pthread.o ...@@ -402,6 +402,12 @@ OBJS-$(HAVE_PTHREADS) += pthread.o
OBJS-$(HAVE_W32THREADS) += w32thread.o OBJS-$(HAVE_W32THREADS) += w32thread.o
# processor-specific code # processor-specific code
FFT-OBJS-$(HAVE_AMD3DNOW) += x86/fft_3dn.o
FFT-OBJS-$(HAVE_AMD3DNOWEXT) += x86/fft_3dn2.o
FFT-OBJS-$(HAVE_SSE) += x86/fft_sse.o
OBJS-$(CONFIG_FFT) += $(FFT-OBJS-yes)
YASM-OBJS-$(CONFIG_FFT) += x86/fft_mmx.o
YASM-OBJS-$(CONFIG_GPL) += x86/h264_deblock_sse2.o \ YASM-OBJS-$(CONFIG_GPL) += x86/h264_deblock_sse2.o \
x86/h264_idct_sse2.o \ x86/h264_idct_sse2.o \
...@@ -435,11 +441,6 @@ OBJS-$(HAVE_MMX) += x86/cpuid.o \ ...@@ -435,11 +441,6 @@ OBJS-$(HAVE_MMX) += x86/cpuid.o \
x86/simple_idct_mmx.o \ x86/simple_idct_mmx.o \
$(MMX-OBJS-yes) $(MMX-OBJS-yes)
OBJS-$(CONFIG_FFT_MMX) += x86/fft_3dn.o \
x86/fft_3dn2.o \
x86/fft_mmx.o \
x86/fft_sse.o \
OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha.o \ OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha.o \
alpha/dsputil_alpha_asm.o \ alpha/dsputil_alpha_asm.o \
alpha/motion_est_alpha.o \ alpha/motion_est_alpha.o \
......
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