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

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index a329db03add856a7186deb11e97e1ba699ed0998..dd569706d9014af181f51a0c8a57da12a2d8be27 100644 (file)
--- 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

diff --git a/libavcodec/i386/dsputil_mmx.c b/libavcodec/i386/dsputil_mmx.c
index 74c6f52173468986ddfad9f922013c1c57b57ce6..09d781fb2af5a24e6b7140cf1191677393c2692d 100644 (file)
--- a/libavcodec/i386/dsputil_mmx.c
+++ b/libavcodec/i386/dsputil_mmx.c
@@ -3042,6 +3042,7 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx)
                 c->idct_add= ff_simple_idct_add_mmx;
                 c->idct    = ff_simple_idct_mmx;
                 c->idct_permutation_type= FF_SIMPLE_IDCT_PERM;
+#ifdef CONFIG_GPL
             }else if(idct_algo==FF_IDCT_LIBMPEG2MMX){
                 if(mm_flags & MM_MMXEXT){
                     c->idct_put= ff_libmpeg2mmx2_idct_put;
@@ -3053,6 +3054,7 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx)
                     c->idct    = ff_mmx_idct;
                 }
                 c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;
+#endif
             }else if(idct_algo==FF_IDCT_VP3 &&
                      !(avctx->flags & CODEC_FLAG_BITEXACT)){
                 if(mm_flags & MM_SSE2){

diff --git a/libavcodec/i386/idct_mmx.c b/libavcodec/i386/idct_mmx.c
index 1c8632fb7cbe7112a71885d7d2468638cb4974e8..ba595845a4e101539954f594ca69c666690ce0b5 100644 (file)
--- a/libavcodec/i386/idct_mmx.c
+++ b/libavcodec/i386/idct_mmx.c
@@ -1,6 +1,3 @@
-/*
- * Note: For libavcodec, this code can also be used under the LGPL license
- */
 /*
  * idct_mmx.c
  * Copyright (C) 1999-2001 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>