diff options
author | Diego Biurrun <diego@biurrun.de> | 2009-06-07 12:52:31 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2009-06-07 12:52:31 +0000 |
commit | dd2089dfd8c3851f66f1dc5fd29d8030379bb2dc (patch) | |
tree | a14a247472cb7a9bc066f375a3cb682bf376eca4 /LICENSE | |
parent | df0ff1a02954a665a3c88536cf7dcf2f9cdca5a3 (diff) |
Merge (L)GPL upgrade code and related changes from trunk.
Originally committed as revision 19129 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
Diffstat (limited to 'LICENSE')
-rw-r--r-- | LICENSE | 28 |
1 files changed, 20 insertions, 8 deletions
@@ -1,10 +1,13 @@ +FFmpeg: +------- + 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+. @@ -18,6 +21,20 @@ Specifically, the GPL parts of FFmpeg are libavcodec/x86/idct_mmx.c - the X11 grabber in libavdevice/x11grab.c +There are a handful of files under other licensing terms, namely: + +* The files libavcodec/jfdctfst.c, libavcodec/jfdctint.c, libavcodec/jrevdct.c + are taken from libjpeg, see the top of the files for licensing details. + +Should you, for whatever reason, prefer to use version 3 of the (L)GPL, then +the configure parameter --enable-version3 will activate this licensing option +for you. Read the file COPYING.LGPLv3 or, if you have enabled GPL parts, +COPYING.GPLv3 to learn the exact legal terms that apply in this case. + + +external libraries: +------------------- + Some external libraries, e.g. libx264, are under GPL and can be used in conjunction with FFmpeg. They require --enable-gpl to be passed to configure as well. @@ -26,8 +43,3 @@ The nonfree external libraries libamrnb, libamrwb and libfaac can be hooked up in FFmpeg. You need to pass --enable-nonfree to configure to enable them. Employ this option with care as FFmpeg then becomes nonfree and unredistributable. Note that libfaac claims to be LGPL, but is not. - -There are a handful of files under other licensing terms, namely: - -* The files libavcodec/jfdctfst.c, libavcodec/jfdctint.c, libavcodec/jrevdct.c - are taken from libjpeg, see the top of the files for licensing details. |