Skip to content

Commit

Permalink
Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGP…
Browse files Browse the repository at this point in the history
…Lv2.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
  • Loading branch information
DonDiego committed Jun 5, 2009
1 parent f3908a8 commit ecc1330
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -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+.

Expand Down

0 comments on commit ecc1330

Please sign in to comment.