Mercurial > libavcodec.hg

changeset 8540:1d9421a599ae libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ensure that no GPL code is linked to LGPL only libavcodec
author aurel
date Tue, 06 Jan 2009 22:01:57 +0000
parents 01ec89cc9a10
children 16a315fdad0b
files Makefile
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue Jan 06 18:58:18 2009 +0000
+++ b/Makefile	Tue Jan 06 22:01:57 2009 +0000
@@ -393,6 +393,9 @@
 OBJS-$(HAVE_W32THREADS)                += w32thread.o
 
 # processor-specific code
+YASM-OBJS-$(CONFIG_GPL)                += x86/h264_deblock_sse2.o       \
+                                          x86/h264_idct_sse2.o          \
+
 MMX-OBJS-$(CONFIG_CAVS_DECODER)        += x86/cavsdsp_mmx.o
 MMX-OBJS-$(CONFIG_ENCODERS)            += x86/dsputilenc_mmx.o
 MMX-OBJS-$(CONFIG_FLAC_ENCODER)        += x86/flacdsp_mmx.o
@@ -407,8 +410,7 @@
 MMX-OBJS-$(CONFIG_VP6F_DECODER)        += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o
 MMX-OBJS-$(CONFIG_WMV3_DECODER)        += x86/vc1dsp_mmx.o
 MMX-OBJS-$(HAVE_YASM)                  += x86/dsputil_yasm.o            \
-                                          x86/h264_deblock_sse2.o       \
-                                          x86/h264_idct_sse2.o          \
+                                          $(YASM-OBJS-yes)
 
 OBJS-$(HAVE_MMX)                       += x86/cpuid.o                   \
                                           x86/dnxhd_mmx.o               \