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

Originally committed as revision 23482 to svn://svn.ffmpeg.org/ffmpeg/trunk
oldabi
Diego Biurrun 15 years ago
parent 3511242d22
commit 788c82e308
  1. 4
      LICENSE
  2. 1
      configure

@ -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 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 pass --enable-nonfree to configure to enable it. Employ this option with care
as FFmpeg then becomes nonfree and unredistributable. 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

@ -2343,7 +2343,6 @@ die_license_disabled gpl postproc
die_license_disabled gpl x11grab die_license_disabled gpl x11grab
die_license_disabled nonfree libfaac die_license_disabled nonfree libfaac
die_license_disabled nonfree libvpx
die_license_disabled version3 libopencore_amrnb die_license_disabled version3 libopencore_amrnb
die_license_disabled version3 libopencore_amrwb die_license_disabled version3 libopencore_amrwb

Loading…
Cancel
Save