Skip to content

Commit ecc1330

Browse files
committed
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
1 parent f3908a8 commit ecc1330

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

COPYING.GPL COPYING.GPLv2

File renamed without changes.

COPYING.LGPL COPYING.LGPLv2.1

File renamed without changes.

LICENSE

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Most files in FFmpeg are under the GNU Lesser General Public License version 2.1
2-
or later (LGPL v2.1+). Read the file COPYING.LGPL for details. Some other files
3-
have a MIT/X11/BSD-style license. In combination the LGPL v2.1+ applies to
2+
or later (LGPL v2.1+). Read the file COPYING.LGPLv2.1 for details. Some other
3+
files have MIT/X11/BSD-style licenses. In combination the LGPL v2.1+ applies to
44
FFmpeg.
55

66
Some optional parts of FFmpeg are licensed under the GNU General Public License
7-
version 2 or later (GPL v2+). See the file COPYING.GPL for details. None of
7+
version 2 or later (GPL v2+). See the file COPYING.GPLv2 for details. None of
88
these parts are used by default, you have to explicitly pass --enable-gpl to
99
configure to activate them. In this case, FFmpeg's license changes to GPL v2+.
1010

0 commit comments

Comments
 (0)