Browse code

Merge LGPL relicensing of AltiVec optimizations.

Originally committed as revision 18491 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

Diego Biurrun authored on 2009/04/13 19:15:48
Showing 2 changed files
... ...
@@ -11,7 +11,7 @@ configure to activate them. In this case, FFmpeg's license changes to GPL v2+.
11 11
 Specifically, the GPL parts of FFmpeg are
12 12
 
13 13
 - libpostproc
14
-- some x86 and AltiVec optimizations in libswscale
14
+- some x86 optimizations in libswscale
15 15
 - optional x86 optimizations in the files
16 16
   libavcodec/x86/h264_deblock_sse2.asm
17 17
   libavcodec/x86/h264_idct_sse2.asm
... ...
@@ -6,18 +6,18 @@
6 6
  *
7 7
  * This file is part of FFmpeg.
8 8
  *
9
- * FFmpeg is free software; you can redistribute it and/or modify
10
- * it under the terms of the GNU General Public License as published by
11
- * the Free Software Foundation; either version 2 of the License, or
12
- * (at your option) any later version.
9
+ * FFmpeg is free software; you can redistribute it and/or
10
+ * modify it under the terms of the GNU Lesser General Public
11
+ * License as published by the Free Software Foundation; either
12
+ * version 2.1 of the License, or (at your option) any later version.
13 13
  *
14 14
  * FFmpeg is distributed in the hope that it will be useful,
15 15
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
16
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
- * GNU General Public License for more details.
16
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
17
+ * Lesser General Public License for more details.
18 18
  *
19
- * You should have received a copy of the GNU General Public License
20
- * along with FFmpeg; if not, write to the Free Software
19
+ * You should have received a copy of the GNU Lesser General Public
20
+ * License along with FFmpeg; if not, write to the Free Software
21 21
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
22 22
  */
23 23