diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-06-05 09:51:31 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-06-05 09:51:31 +0000 |
| commit | ecc1330a6dfb074e637a3ea9e05e16c767587c97 (patch) | |
| tree | 5b828c4fb25bc828ca9064df1e703745f1ce4956 | |
| parent | f3908a82bc487fcf89fcdb39d92a385d79a86a0f (diff) | |
| download | ffmpeg-ecc1330a6dfb074e637a3ea9e05e16c767587c97.tar.gz | |
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
| -rw-r--r-- | COPYING.GPLv2 (renamed from COPYING.GPL) | 0 | ||||
| -rw-r--r-- | COPYING.LGPLv2.1 (renamed from COPYING.LGPL) | 0 | ||||
| -rw-r--r-- | LICENSE | 6 |
3 files changed, 3 insertions, 3 deletions
diff --git a/COPYING.GPL b/COPYING.GPLv2 index d159169d10..d159169d10 100644 --- a/COPYING.GPL +++ b/COPYING.GPLv2 diff --git a/COPYING.LGPL b/COPYING.LGPLv2.1 index 00b4fedfe7..00b4fedfe7 100644 --- a/COPYING.LGPL +++ b/COPYING.LGPLv2.1 @@ -1,10 +1,10 @@ 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 -have a MIT/X11/BSD-style license. In combination the LGPL v2.1+ applies to +or later (LGPL v2.1+). Read the file COPYING.LGPLv2.1 for details. Some other +files have MIT/X11/BSD-style licenses. In combination the LGPL v2.1+ applies to FFmpeg. 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 configure to activate them. In this case, FFmpeg's license changes to GPL v2+. |