[FFmpeg-cvslog] r23482 - in trunk: LICENSE configure

[diego]

Author: diego
Date: Sat Jun  5 10:01:47 2010
New Revision: 23482

Log:
libvpx now has an (L)GPL-compatible license.

Modified:
   trunk/LICENSE
   trunk/configure

Modified: trunk/LICENSE
==============================================================================
--- trunk/LICENSE	Sat Jun  5 01:33:36 2010	(r23481)
+++ trunk/LICENSE	Sat Jun  5 10:01:47 2010	(r23482)
@@ -46,7 +46,3 @@ version needs to be upgraded by passing 
 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.

Modified: trunk/configure
==============================================================================
--- trunk/configure	Sat Jun  5 01:33:36 2010	(r23481)
+++ trunk/configure	Sat Jun  5 10:01:47 2010	(r23482)
@@ -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