From 0f69ca7f143bbe143a8bdc31240bfc563452874a Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Fri, 13 Jul 2007 14:33:20 +0000
Subject: [PATCH] Clarify license requirements for contributions.

Originally committed as revision 9626 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 doc/ffmpeg-doc.texi | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 666c2acfd..c759e87c4 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -1551,6 +1551,11 @@ should also be avoided if they don't make the code easier to understand.
 
 @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.
+@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)
-- 
2.11.0