Browse code

doc/developer: Merge license related policy items

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2013/10/12 06:00:16
Showing 1 changed files
... ...
@@ -253,6 +253,8 @@ a gift-style license, the
253 253
 @uref{http://www.gnu.org/licenses/gpl-2.0.html, GPL 2} including
254 254
 an "or any later version" clause is also acceptable, but LGPL is
255 255
 preferred.
256
+If you add a new file, give it a proper license header. Do not copy and
257
+paste it from a random place, use an existing file as template.
256 258
 
257 259
 @item
258 260
 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 384
 be changed to not generate a warning unless that causes a slowdown
385 385
 or obfuscates the code.
386 386
 
387
-@item
388
-If you add a new file, give it a proper license header. Do not copy and
389
-paste it from a random place, use an existing file as template.
390 387
 @end enumerate
391 388
 
392 389
 We think our rules are not too hard. If you have comments, contact us.