Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2010-06-05 17:58:13 +0400
committerReinhard Tartler <siretart@tauware.de>2010-06-05 17:58:13 +0400
commiteb4b8b96fcb2192ba118315bfee6651400888323 (patch)
tree08726293a6ddc2cc9137f77b667942468231dc92 /LICENSE
parent373010971efc60c2361bca7df598969b78dae360 (diff)
libvpx now has an (L)GPL-compatible license.
backport r23482 by diego Originally committed as revision 23487 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE4
1 files changed, 0 insertions, 4 deletions
diff --git a/LICENSE b/LICENSE
index b87e399747..668350b185 100644
--- a/LICENSE
+++ b/LICENSE
@@ -48,7 +48,3 @@ 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.