diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-06 22:01:57 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-06 22:01:57 +0000 |
| commit | 16cda1535edf853c31506b2c737d0a6873744550 (patch) | |
| tree | 61dfff8421f7b24640074c9d1afc10828764fd80 /libavcodec/Makefile | |
| parent | 448ecb68e3695a6b05e5af46c3e1483732cfbd9e (diff) | |
ensure that no GPL code is linked to LGPL only libavcodec
Originally committed as revision 16456 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index f99dbbb403..1dce63c88b 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -393,6 +393,9 @@ OBJS-$(HAVE_PTHREADS) += pthread.o 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_VP6A_DECODER) += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o 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 \ |