[Ffmpeg-cvslog] r6557 - in trunk/libavcodec: Makefile i386/dsputil_mmx.c i386/idct_mmx_xvid.c

[diego]

Author: diego
Date: Thu Oct  5 02:23:24 2006
New Revision: 6557

Modified:
   trunk/libavcodec/Makefile
   trunk/libavcodec/i386/dsputil_mmx.c
   trunk/libavcodec/i386/idct_mmx_xvid.c

Log:
Switch idct_mmx_xvid.c from GPL to LGPL as permitted by the
author, Peter Ross (pross xvid org).


Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	(original)
+++ trunk/libavcodec/Makefile	Thu Oct  5 02:23:24 2006
@@ -322,6 +322,7 @@
         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 @@
         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

Modified: trunk/libavcodec/i386/dsputil_mmx.c
==============================================================================
--- trunk/libavcodec/i386/dsputil_mmx.c	(original)
+++ trunk/libavcodec/i386/dsputil_mmx.c	Thu Oct  5 02:23:24 2006
@@ -2742,7 +2742,6 @@
     ff_vp3_idct_mmx(block);
     add_pixels_clamped_mmx(block, dest, line_size);
 }
-#ifdef CONFIG_GPL
 static void ff_idct_xvid_mmx_put(uint8_t *dest, int line_size, DCTELEM *block)
 {
     ff_idct_xvid_mmx (block);
@@ -2763,7 +2762,6 @@
     ff_idct_xvid_mmx2 (block);
     add_pixels_clamped_mmx(block, dest, line_size);
 }
-#endif
 
 static void vorbis_inverse_coupling_3dnow(float *mag, float *ang, int blocksize)
 {
@@ -3121,7 +3119,6 @@
                 }
             }else if(idct_algo==FF_IDCT_CAVS){
                     c->idct_permutation_type= FF_TRANSPOSE_IDCT_PERM;
-#ifdef CONFIG_GPL
             }else if(idct_algo==FF_IDCT_XVIDMMX){
                 if(mm_flags & MM_MMXEXT){
                     c->idct_put= ff_idct_xvid_mmx2_put;
@@ -3132,7 +3129,6 @@
                     c->idct_add= ff_idct_xvid_mmx_add;
                     c->idct    = ff_idct_xvid_mmx;
                 }
-#endif
             }
         }
 

Modified: trunk/libavcodec/i386/idct_mmx_xvid.c
==============================================================================
--- trunk/libavcodec/i386/idct_mmx_xvid.c	(original)
+++ trunk/libavcodec/i386/idct_mmx_xvid.c	Thu Oct  5 02:23:24 2006
@@ -5,20 +5,19 @@
 // *
 // *  Copyright(C) 2001 Peter Ross <pross at xvid.org>
 // *
-// *  This program is free software; you can redistribute it and/or modify it
-// *  under the terms of the GNU General Public License as published by
-// *  the Free Software Foundation; either version 2 of the License, or
-// *  (at your option) any later version.
+// * This library is free software; you can redistribute it and/or
+// * modify it under the terms of the GNU Lesser General Public
+// * License as published by the Free Software Foundation; either
+// * version 2 of the License, or (at your option) any later version.
 // *
-// *  This program is distributed in the hope that it will be useful,
-// *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-// *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// *  GNU General Public License for more details.
+// * This library is distributed in the hope that it will be useful,
+// * but WITHOUT ANY WARRANTY; without even the implied warranty of
+// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// * Lesser General Public License for more details.
 // *
-// *  You should have received a copy of the GNU General Public License
-// *  along with this program; if not, write to the Free Software Foundation,
-// *  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
+// * You should have received a copy of the GNU Lesser General Public License
+// * along with this library; if not, write to the Free Software Foundation,
+// * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 // *
 // * $Id$
 // *