Commit 4b948dca authored by Michael Niedermayer's avatar Michael Niedermayer

doc/developer: Merge license related policy items

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 43dec5ef
...@@ -253,6 +253,8 @@ a gift-style license, the ...@@ -253,6 +253,8 @@ a gift-style license, the
@uref{http://www.gnu.org/licenses/gpl-2.0.html, GPL 2} including @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 an "or any later version" clause is also acceptable, but LGPL is
preferred. 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 @item
You must not commit code which breaks FFmpeg! (Meaning unfinished but 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 ...@@ -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 be changed to not generate a warning unless that causes a slowdown
or obfuscates the code. 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 @end enumerate
We think our rules are not too hard. If you have comments, contact us. We think our rules are not too hard. If you have comments, contact us.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment