[FFmpeg-cvslog] r18491 - in branches/0.5: . LICENSE libswscale/swscale_altivec_template.c

diego subversion
Mon Apr 13 12:15:48 CEST 2009


Author: diego
Date: Mon Apr 13 12:15:48 2009
New Revision: 18491

Log:
Merge LGPL relicensing of AltiVec optimizations.

Modified:
   branches/0.5/   (props changed)
   branches/0.5/LICENSE
   branches/0.5/libswscale/swscale_altivec_template.c

Modified: branches/0.5/LICENSE
==============================================================================
--- branches/0.5/LICENSE	Mon Apr 13 12:15:04 2009	(r18490)
+++ branches/0.5/LICENSE	Mon Apr 13 12:15:48 2009	(r18491)
@@ -11,7 +11,7 @@ configure to activate them. In this case
 Specifically, the GPL parts of FFmpeg are
 
 - libpostproc
-- some x86 and AltiVec optimizations in libswscale
+- some x86 optimizations in libswscale
 - optional x86 optimizations in the files
   libavcodec/x86/h264_deblock_sse2.asm
   libavcodec/x86/h264_idct_sse2.asm

Modified: branches/0.5/libswscale/swscale_altivec_template.c
==============================================================================
--- branches/0.5/libswscale/swscale_altivec_template.c	Mon Apr 13 12:15:04 2009	(r18490)
+++ branches/0.5/libswscale/swscale_altivec_template.c	Mon Apr 13 12:15:48 2009	(r18491)
@@ -6,18 +6,18 @@
  *
  * This file is part of FFmpeg.
  *
- * FFmpeg 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.
+ * FFmpeg 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.1 of the License, or (at your option) any later version.
  *
  * FFmpeg 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.
+ * 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 FFmpeg; if not, write to the Free Software
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 



More information about the ffmpeg-cvslog mailing list