Browse code
libvpx now has an (L)GPL-compatible license.
Originally committed as revision 23482 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diego Biurrun authored on 2010/06/05 17:01:47Showing 2 changed files
| ... | ... |
@@ -46,7 +46,3 @@ version needs to be upgraded by passing --enable-version3 to configure. |
| 46 | 46 |
The nonfree external library libfaac can be hooked up in FFmpeg. You need to |
| 47 | 47 |
pass --enable-nonfree to configure to enable it. Employ this option with care |
| 48 | 48 |
as FFmpeg then becomes nonfree and unredistributable. |
| 49 |
- |
|
| 50 |
-The libvpx external library has a license that is (L)GPL incompatible. If you |
|
| 51 |
-combine it with FFmpeg the resulting binaries are unredistributable. Thus you |
|
| 52 |
-need to pass --enable-nonfree to configure to enable it. |
| ... | ... |
@@ -2343,7 +2343,6 @@ die_license_disabled gpl postproc |
| 2343 | 2343 |
die_license_disabled gpl x11grab |
| 2344 | 2344 |
|
| 2345 | 2345 |
die_license_disabled nonfree libfaac |
| 2346 |
-die_license_disabled nonfree libvpx |
|
| 2347 | 2346 |
|
| 2348 | 2347 |
die_license_disabled version3 libopencore_amrnb |
| 2349 | 2348 |
die_license_disabled version3 libopencore_amrwb |