aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2010-05-30 22:25:40 +0000
committerDiego Biurrun <diego@biurrun.de>2010-05-30 22:25:40 +0000
commit661092004f9cbe300f1c45c68282b4f9856c6dd5 (patch)
tree10464883f1caa59bb4fd25faaa125d3f960812d6
parentf7f9f18f8394806b2e11b1a4412f8c4847332fcb (diff)
downloadffmpeg-661092004f9cbe300f1c45c68282b4f9856c6dd5.tar.gz
Require --enable-nonfree flag for libvpx.
The license of libvpx is incompatible with the (L)GPL. As long as this is the case, the only way to use it is by marking the result as nonfree. backport r23371 by diego Originally committed as revision 23390 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
-rwxr-xr-xconfigure1
1 files changed, 1 insertions, 0 deletions
diff --git a/configure b/configure
index 8b3ebf6449..4c37a02e98 100755
--- a/configure
+++ b/configure
@@ -2335,6 +2335,7 @@ die_license_disabled gpl postproc
die_license_disabled gpl x11grab
die_license_disabled nonfree libfaac
+die_license_disabled nonfree libvpx
die_license_disabled version3 libopencore_amrnb
die_license_disabled version3 libopencore_amrwb