diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-07-13 14:33:20 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-07-13 14:33:20 +0000 |
| commit | 0f69ca7f143bbe143a8bdc31240bfc563452874a (patch) | |
| tree | 7bfa7ee20fe4aaa0ed5b55d2e81d18027a0cd2ff /doc/ffmpeg-doc.texi | |
| parent | 63e24954beb7a7b6528ea830b6f224f19083f5f6 (diff) | |
Clarify license requirements for contributions.
Originally committed as revision 9626 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc/ffmpeg-doc.texi')
| -rw-r--r-- | doc/ffmpeg-doc.texi | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi index 666c2acfd4..c759e87c44 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) |