diff options
author | Luca Abeni <lucabe72@email.it> | 2006-11-19 10:38:12 +0000 |
---|---|---|
committer | Luca Abeni <lucabe72@email.it> | 2006-11-19 10:38:12 +0000 |
commit | 807e0c664594fb54f2daee1e24acae48043ac975 (patch) | |
tree | 92ddf1b3419ff79f6f775382f8b219b8c4da052d /libswscale/swscale.h | |
parent | 40a08c7e9ab0ce2603a22ccacc02252bfa035b9f (diff) | |
download | ffmpeg-807e0c664594fb54f2daee1e24acae48043ac975.tar.gz |
Clarify that some of the non-SIMD code is now LGPLed.
All the authours of such code agreed.
Originally committed as revision 21045 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
Diffstat (limited to 'libswscale/swscale.h')
-rw-r--r-- | libswscale/swscale.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/libswscale/swscale.h b/libswscale/swscale.h index 96978a03a7..06088b8e49 100644 --- a/libswscale/swscale.h +++ b/libswscale/swscale.h @@ -3,22 +3,19 @@ * * 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 St, Fifth Floor, Boston, MA 02110-1301 USA - * - * the C code (not assembly, mmx, ...) of the swscaler which has been written - * by Michael Niedermayer can be used under the LGPL license too */ #ifndef SWSCALE_H |