changeset 3717:ea9fe1c9d126 libavcodec

Remove the LGPL exception clause as discussed on ffmpeg-devel and move the dependent code under CONFIG_GPL.

--- a/Makefile	Wed Sep 13 21:39:41 2006 +0000
+++ b/Makefile	Thu Sep 14 00:38:03 2006 +0000
@@ -292,11 +292,11 @@
 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

--- a/i386/dsputil_mmx.c	Wed Sep 13 21:39:41 2006 +0000
+++ b/i386/dsputil_mmx.c	Thu Sep 14 00:38:03 2006 +0000
@@ -3042,6 +3042,7 @@
                 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 @@
                     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){

--- a/i386/idct_mmx.c	Wed Sep 13 21:39:41 2006 +0000
+++ b/i386/idct_mmx.c	Thu Sep 14 00:38:03 2006 +0000
@@ -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 <[e-mail]>