[FFmpeg-cvslog] r19115 - trunk/LICENSE

diego subversion
Fri Jun 5 12:58:48 CEST 2009


Author: diego
Date: Fri Jun  5 12:58:48 2009
New Revision: 19115

Log:
Move around one paragraph, add headings for greater clarity.

Modified:
   trunk/LICENSE

Modified: trunk/LICENSE
==============================================================================
--- trunk/LICENSE	Fri Jun  5 11:51:31 2009	(r19114)
+++ trunk/LICENSE	Fri Jun  5 12:58:48 2009	(r19115)
@@ -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 ar
   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,
 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.



More information about the ffmpeg-cvslog mailing list