aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/Makefile
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2006-10-05 00:23:24 +0000
committerDiego Biurrun <diego@biurrun.de>2006-10-05 00:23:24 +0000
commit0eb59ddba4315a6cd2e979e653c551d3463449ec (patch)
tree538dfa5ad2d45b0374ceafa73a96e2a3569bb867 /libavcodec/Makefile
parent777938e190da5d01f2d01ef8a01afd0ab879424c (diff)
downloadffmpeg-0eb59ddba4315a6cd2e979e653c551d3463449ec.tar.gz
Switch idct_mmx_xvid.c from GPL to LGPL as permitted by the
author, Peter Ross (pross xvid org). Originally committed as revision 6557 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r--libavcodec/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 71b2a0d5ab..09b3009cce 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -322,6 +322,7 @@ OBJS += i386/fdct_mmx.o \
i386/mpegvideo_mmx.o \
i386/motion_est_mmx.o \
i386/simple_idct_mmx.o \
+ i386/idct_mmx_xvid.o \
i386/fft_sse.o \
i386/vp3dsp_mmx.o \
i386/vp3dsp_sse2.o \
@@ -330,7 +331,7 @@ OBJS += i386/fdct_mmx.o \
i386/snowdsp_mmx.o \
ifeq ($(CONFIG_GPL),yes)
-OBJS += i386/idct_mmx.o i386/idct_mmx_xvid.o
+OBJS += i386/idct_mmx.o
endif
ifeq ($(CONFIG_CAVS_DECODER),yes)
OBJS += i386/cavsdsp_mmx.o