From eb4b8b96fcb2192ba118315bfee6651400888323 Mon Sep 17 00:00:00 2001 From: Reinhard Tartler Date: Sat, 5 Jun 2010 13:58:13 +0000 Subject: [PATCH] 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 --- LICENSE | 4 ---- configure | 1 - 2 files changed, 5 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. diff --git a/configure b/configure index 73dff04178..cdec2f59a3 100755 --- a/configure +++ b/configure @@ -2336,7 +2336,6 @@ 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