clarify GPL patch acceptance policy

Originally committed as revision 4588 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/doc/faq.texi b/doc/faq.texi
index 371b4f9ed4b1e69cfd719d6fd28b86f2ecd6a0ba..93867fc65df099c9e29b328c7e691e122ca655cc 100644 (file)
--- a/doc/faq.texi
+++ b/doc/faq.texi
@@ -184,9 +184,9 @@ you need the debug information, used the *_g versions.
 
 @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