aboutsummaryrefslogtreecommitdiffstats
path: root/doc/faq.texi
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2005-09-12 15:16:27 +0000
committerMichael Niedermayer <michaelni@gmx.at>2005-09-12 15:16:27 +0000
commit291dcdb356690308e91eef16af715dc4c45ff5bd (patch)
tree9fd570d03f90588f084c9d24e0550f165235d4b4 /doc/faq.texi
parentec9127c4a405bfb4747e8bc6f550f1c5d052810b (diff)
downloadffmpeg-291dcdb356690308e91eef16af715dc4c45ff5bd.tar.gz
clarify GPL patch acceptance policy
Originally committed as revision 4588 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc/faq.texi')
-rw-r--r--doc/faq.texi6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/faq.texi b/doc/faq.texi
index 371b4f9ed4..93867fc65d 100644
--- 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