[FFmpeg-cvslog] r9626 - trunk/doc/ffmpeg-doc.texi

[diego]

Author: diego
Date: Fri Jul 13 16:33:20 2007
New Revision: 9626

Log:
Clarify license requirements for contributions.


Modified:
   trunk/doc/ffmpeg-doc.texi

Modified: trunk/doc/ffmpeg-doc.texi
==============================================================================
--- trunk/doc/ffmpeg-doc.texi	(original)
+++ trunk/doc/ffmpeg-doc.texi	Fri Jul 13 16:33:20 2007
@@ -1551,6 +1551,11 @@ should also be avoided if they don't mak
 
 @enumerate
 @item
+   Contributions should be licensed under the LGPL 2.1, including an
+   "or any later version" clause, or the MIT license.  GPL 2 including
+   an "or any later version" clause is also acceptable, but LGPL is
+   preferred.
+ at item
    You must not commit code which breaks FFmpeg! (Meaning unfinished but
    enabled code which breaks compilation or compiles but does not work or
    breaks the regression tests)