[FFmpeg-cvslog] r18945 - in trunk: Makefile libavcodec/Makefile

diego subversion
Mon May 25 21:02:35 CEST 2009


Author: diego
Date: Mon May 25 21:02:35 2009
New Revision: 18945

Log:
The MLP optimizations do not depend on HAVE_MMX, but on ARCH_X86.
Build them when ARCH_X86 is enabled. Fixes linking with MMX disabled.

Modified:
   trunk/Makefile
   trunk/libavcodec/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Mon May 25 20:46:47 2009	(r18944)
+++ trunk/Makefile	Mon May 25 21:02:35 2009	(r18945)
@@ -46,7 +46,7 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF)
 	$(STRIP) $@
 
 SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES \
-               ALTIVEC-OBJS MMX-OBJS NEON-OBJS YASM-OBJS-FFT YASM-OBJS
+               ALTIVEC-OBJS MMX-OBJS NEON-OBJS X86-OBJS YASM-OBJS-FFT YASM-OBJS
 
 define RESET
 $(1) :=

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	Mon May 25 20:46:47 2009	(r18944)
+++ trunk/libavcodec/Makefile	Mon May 25 21:02:35 2009	(r18945)
@@ -434,6 +434,11 @@ OBJS-$(HAVE_PTHREADS)                  +
 OBJS-$(HAVE_W32THREADS)                += w32thread.o
 
 # processor-specific code
+X86-OBJS-$(CONFIG_MLP_DECODER)         += x86/mlpdsp.o
+X86-OBJS-$(CONFIG_TRUEHD_DECODER)      += x86/mlpdsp.o
+
+OBJS-$(ARCH_X86)                       += $(X86-OBJS-yes)
+
 YASM-OBJS-FFT-$(HAVE_AMD3DNOW)         += x86/fft_3dn.o
 YASM-OBJS-FFT-$(HAVE_AMD3DNOWEXT)      += x86/fft_3dn2.o
 YASM-OBJS-FFT-$(HAVE_SSE)              += x86/fft_sse.o
@@ -445,10 +450,8 @@ MMX-OBJS-$(CONFIG_CAVS_DECODER)        +
 MMX-OBJS-$(CONFIG_ENCODERS)            += x86/dsputilenc_mmx.o
 MMX-OBJS-$(CONFIG_FLAC_ENCODER)        += x86/flacdsp_mmx.o
 MMX-OBJS-$(CONFIG_GPL)                 += x86/idct_mmx.o
-MMX-OBJS-$(CONFIG_MLP_DECODER)         += x86/mlpdsp.o
 MMX-OBJS-$(CONFIG_SNOW_DECODER)        += x86/snowdsp_mmx.o
 MMX-OBJS-$(CONFIG_THEORA_DECODER)      += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o
-MMX-OBJS-$(CONFIG_TRUEHD_DECODER)      += x86/mlpdsp.o
 MMX-OBJS-$(CONFIG_VC1_DECODER)         += x86/vc1dsp_mmx.o
 MMX-OBJS-$(CONFIG_VP3_DECODER)         += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o
 MMX-OBJS-$(CONFIG_VP5_DECODER)         += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o



More information about the ffmpeg-cvslog mailing list