diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-11 23:00:16 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-13 10:46:32 +0200 |
commit | 4b948dcadb8b4cd69990a1bb3142cc9456fbcfdb (patch) | |
tree | 91ee14ebfbd4bbbad85b636ae415749fb36e4b7a /doc | |
parent | 43dec5ef9a360c9ffac3278f464832bd99af0cb0 (diff) | |
download | ffmpeg-streaming-4b948dcadb8b4cd69990a1bb3142cc9456fbcfdb.zip ffmpeg-streaming-4b948dcadb8b4cd69990a1bb3142cc9456fbcfdb.tar.gz |
doc/developer: Merge license related policy items
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/developer.texi | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/developer.texi b/doc/developer.texi index b9951a4..71f4978 100644 --- a/doc/developer.texi +++ b/doc/developer.texi @@ -253,6 +253,8 @@ a gift-style license, the @uref{http://www.gnu.org/licenses/gpl-2.0.html, GPL 2} including an "or any later version" clause is also acceptable, but LGPL is preferred. +If you add a new file, give it a proper license header. Do not copy and +paste it from a random place, use an existing file as template. @item You must not commit code which breaks FFmpeg! (Meaning unfinished but @@ -384,9 +386,6 @@ If it is a bug, the bug has to be fixed. If it is not, the code should be changed to not generate a warning unless that causes a slowdown or obfuscates the code. -@item -If you add a new file, give it a proper license header. Do not copy and -paste it from a random place, use an existing file as template. @end enumerate We think our rules are not too hard. If you have comments, contact us. |