aboutsummaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2010-05-31 21:41:53 +0000
committerDiego Biurrun <diego@biurrun.de>2010-05-31 21:41:53 +0000
commit879c9d1a632cfd374d50a6d341c7e83ccc22b060 (patch)
tree966fbf6ee61f451e2488b55d65db06798adf7a7e /LICENSE
parent0a624147c302da7e2a232deea7c38a2bb68b10ff (diff)
downloadffmpeg-879c9d1a632cfd374d50a6d341c7e83ccc22b060.tar.gz
Add a short note about libvpx.
Originally committed as revision 23394 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE4
1 files changed, 4 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index 6aafde8463..aadd464f5d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -46,3 +46,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.