Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-12 01:00:16 +0400
committerMichael Niedermayer <michaelni@gmx.at>2013-10-13 12:46:32 +0400
commit4b948dcadb8b4cd69990a1bb3142cc9456fbcfdb (patch)
tree91ee14ebfbd4bbbad85b636ae415749fb36e4b7a /doc/developer.texi
parent43dec5ef9a360c9ffac3278f464832bd99af0cb0 (diff)
doc/developer: Merge license related policy items
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/developer.texi')
-rw-r--r--doc/developer.texi5
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/developer.texi b/doc/developer.texi
index b9951a4c5a..71f4978d49 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.