From 788c82e30832d8b12615f07357e46771901a4727 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sat, 5 Jun 2010 08:01:47 +0000 Subject: [PATCH] libvpx now has an (L)GPL-compatible license. Originally committed as revision 23482 to svn://svn.ffmpeg.org/ffmpeg/trunk --- LICENSE | 4 ---- configure | 1 - 2 files changed, 5 deletions(-) diff --git a/LICENSE b/LICENSE index aadd464f5d..6aafde8463 100644 --- a/LICENSE +++ b/LICENSE @@ -46,7 +46,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 2949d30a33..9b383fd44e 100755 --- a/configure +++ b/configure @@ -2343,7 +2343,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