MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 

This is in preparation for the (L)GPL license upgrade code that will add
version 3 of these licenses.

Originally committed as revision 19114 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2009-06-05 09:51:31 +00:00
parent f3908a82bc
commit ecc1330a6d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
COPYING.GPL → COPYING.GPLv2
View File

0
COPYING.LGPL → COPYING.LGPLv2.1
View File

6
LICENSE
View File

@ -1,10 +1,10 @@
Most files in FFmpeg are under the GNU Lesser General Public License version 2.1 Most files in FFmpeg are under the GNU Lesser General Public License version 2.1
or later (LGPL v2.1+). Read the file COPYING.LGPL for details. Some other files or later (LGPL v2.1+). Read the file COPYING.LGPLv2.1 for details. Some other
have a MIT/X11/BSD-style license. In combination the LGPL v2.1+ applies to files have MIT/X11/BSD-style licenses. In combination the LGPL v2.1+ applies to
FFmpeg. FFmpeg.
Some optional parts of FFmpeg are licensed under the GNU General Public License Some optional parts of FFmpeg are licensed under the GNU General Public License
version 2 or later (GPL v2+). See the file COPYING.GPL for details. None of version 2 or later (GPL v2+). See the file COPYING.GPLv2 for details. None of
these parts are used by default, you have to explicitly pass --enable-gpl to these parts are used by default, you have to explicitly pass --enable-gpl to
configure to activate them. In this case, FFmpeg's license changes to GPL v2+. configure to activate them. In this case, FFmpeg's license changes to GPL v2+.