Permalink
Browse files

Move around one paragraph, add headings for greater clarity.

Originally committed as revision 19115 to svn://svn.ffmpeg.org/ffmpeg/trunk
  • Loading branch information...
1 parent ecc1330 commit 4656c375bc21368b2801977595c6b13e4302b4b8 @DonDiego DonDiego committed Jun 5, 2009
Showing with 12 additions and 5 deletions.
  1. +12 −5 LICENSE
View
17 LICENSE
@@ -1,3 +1,6 @@
+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.LGPLv2.1 for details. Some other
files have MIT/X11/BSD-style licenses. In combination the LGPL v2.1+ applies to
@@ -18,6 +21,15 @@ 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.
+
+
+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 +38,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.

0 comments on commit 4656c37

Please sign in to comment.