LAV
/
FFmpeg
1
0
Fork 0
Code

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
This commit is contained in:
Reinhard Tartler 2010-06-05 13:58:13 +00:00
parent 373010971e
commit eb4b8b96fc
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LICENSE
View File

@ -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.

1
configure vendored
View File

@ -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