diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-09-14 00:38:03 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-09-14 00:38:03 +0000 |
| commit | 7f889a76add819ebdf6469866ff0cd3a6ee117e7 (patch) | |
| tree | 51cc5fc7b1ab9a06660b1f249de44d24fcf10af5 /libavcodec/Makefile | |
| parent | fbb9d1043d775b1ba2524a7f03d05af5b3103cd1 (diff) | |
| download | ffmpeg-7f889a76add819ebdf6469866ff0cd3a6ee117e7.tar.gz | |
Remove the LGPL exception clause as discussed on ffmpeg-devel
and move the dependent code under CONFIG_GPL.
Originally committed as revision 6248 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index a329db03ad..dd569706d9 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -292,11 +292,11 @@ endif ifeq ($(TARGET_MMX),yes) OBJS += i386/fdct_mmx.o i386/cputest.o \ i386/dsputil_mmx.o i386/mpegvideo_mmx.o \ - i386/idct_mmx.o i386/motion_est_mmx.o \ + i386/motion_est_mmx.o \ i386/simple_idct_mmx.o i386/fft_sse.o i386/vp3dsp_mmx.o \ i386/vp3dsp_sse2.o i386/fft_3dn.o i386/fft_3dn2.o i386/snowdsp_mmx.o ifeq ($(CONFIG_GPL),yes) -OBJS += i386/idct_mmx_xvid.o +OBJS += i386/idct_mmx.o i386/idct_mmx_xvid.o endif ifeq ($(CONFIG_CAVS_DECODER),yes) OBJS += i386/cavsdsp_mmx.o |