Browse Source

doc/developer: Merge license related policy items

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.1
Michael Niedermayer 11 years ago
parent
commit
4b948dcadb
1 changed files with 2 additions and 3 deletions
  1. +2
    -3
      doc/developer.texi

+ 2
- 3
doc/developer.texi View File

@@ -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
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.


Loading…
Cancel
Save