[FFmpeg-cvslog] r23487 - in branches/0.6: . LICENSE configure

[siretart]

Author: siretart
Date: Sat Jun  5 15:58:13 2010
New Revision: 23487

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


backport r23482 by diego

Modified:
   branches/0.6/   (props changed)
   branches/0.6/LICENSE
   branches/0.6/configure

Modified: branches/0.6/LICENSE
==============================================================================
--- branches/0.6/LICENSE	Sat Jun  5 14:06:31 2010	(r23486)
+++ branches/0.6/LICENSE	Sat Jun  5 15:58:13 2010	(r23487)
@@ -48,7 +48,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: branches/0.6/configure
==============================================================================
--- branches/0.6/configure	Sat Jun  5 14:06:31 2010	(r23486)
+++ branches/0.6/configure	Sat Jun  5 15:58:13 2010	(r23487)
@@ -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