[Ffmpeg-cvslog] CVS: ffmpeg/doc faq.texi,1.19,1.20

[Michael Niedermayer CVS]

Update of /cvsroot/ffmpeg/ffmpeg/doc
In directory mail:/var2/tmp/cvs-serv2276

Modified Files:
	faq.texi 
Log Message:
clarify GPL patch acceptance policy


Index: faq.texi
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/doc/faq.texi,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- faq.texi	11 Sep 2005 16:39:47 -0000	1.19
+++ faq.texi	12 Sep 2005 15:16:27 -0000	1.20
@@ -184,9 +184,9 @@
 
 @section I do not like the LGPL, can I contribute code under the GPL instead
 
-yes, ffmpeg contains GPL and LGPL code, the GPL code is only compiled if
-'--enable-gpl' is passed to configure in which case the resulting binary will
-be covered by the GPL instead of the LGPL
+yes, as long as the code is optional and can easily and cleanly be placed under 
+#ifdef CONFIG_GPL without breaking anythng, so for example
+a new codec or filter would be ok under GPL while a bugfix to LGPL code wont
 
 @section I want to compile xyz.c alone but my compier produced many errors