aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2010-05-29 09:40:22 +0000
committerDiego Biurrun <diego@biurrun.de>2010-05-29 09:40:22 +0000
commit2c780abfdbcf3331696f429d5eb841798cda5b8f (patch)
tree9950c32dfb74518922b110ca8320da2d74f95312
parent1c100b13679efcdfdda872d0df1751e2776a7b54 (diff)
downloadffmpeg-2c780abfdbcf3331696f429d5eb841798cda5b8f.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. Originally committed as revision 23371 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xconfigure1
1 files changed, 1 insertions, 0 deletions
diff --git a/configure b/configure
index 4713d752b9..226e59c1dd 100755
--- a/configure
+++ b/configure
@@ -2341,6 +2341,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