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

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@23482 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libvpx now has an (L)GPL-compatible license.
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@23482 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
c79ad352 · diego · 87494b41 · c79ad352 · c79ad352
Commit c79ad352 authored Jun 05, 2010 by diego
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

LICENSE LICENSE +0 -4

configure configure +0 -1

No files found.
--- 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.
--- 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