diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-04-13 10:15:48 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-04-13 10:15:48 +0000 |
| commit | 266f6af570c87af4c46f8207aa43e1d88422ed73 (patch) | |
| tree | 4460c2da489aa1f8b26cab194815163ddd67ff4c | |
| parent | 241c55aabe3dfeef2caf413bb2ec37504f488056 (diff) | |
Merge LGPL relicensing of AltiVec optimizations.
Originally committed as revision 18491 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
| -rw-r--r-- | LICENSE | 2 | ||||
| -rw-r--r-- | libswscale/swscale_altivec_template.c | 16 |
2 files changed, 9 insertions, 9 deletions
@@ -11,7 +11,7 @@ configure to activate them. In this case, FFmpeg's license changes to GPL v2+. 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 diff --git a/libswscale/swscale_altivec_template.c b/libswscale/swscale_altivec_template.c index a008b966e8..0bf620bc83 100644 --- a/libswscale/swscale_altivec_template.c +++ b/libswscale/swscale_altivec_template.c @@ -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 */ |