summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2010-05-31 21:49:53 +0000
committerReinhard Tartler <siretart@tauware.de>2010-05-31 21:49:53 +0000
commit70ea5176a55a20f54d579e45a9cfeaf5d5ee0eb5 (patch)
tree678982ff52b3468834fed73f22d65db736ee38c9
parent661092004f9cbe300f1c45c68282b4f9856c6dd5 (diff)
Add a short note about libvpx.
backport r23394 by diego Originally committed as revision 23395 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
-rw-r--r--LICENSE4
1 files changed, 4 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index 668350b185..b87e399747 100644
--- a/LICENSE
+++ b/LICENSE
@@ -48,3 +48,7 @@ version needs to be upgraded by passing --enable-version3 to configure.
The nonfree external library libfaac can be hooked up in FFmpeg. You need to
pass --enable-nonfree to configure to enable it. Employ this option with care
as FFmpeg then becomes nonfree and unredistributable.
+
+The libvpx external library has a license that is (L)GPL incompatible. If you
+combine it with FFmpeg the resulting binaries are unredistributable. Thus you
+need to pass --enable-nonfree to configure to enable it.