[FFmpeg-cvslog] LICENSE: Add missing libraries that need --enable-version3.

Carl Eugen Hoyos git at videolan.org
Mon Aug 12 03:27:11 EEST 2019


ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg at gmail.com> | Mon Aug 12 02:25:39 2019 +0200| [aecf5cbd68021e2f2250a2d9aa53493ac73e7c1e] | committer: Carl Eugen Hoyos

LICENSE: Add missing libraries that need --enable-version3.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aecf5cbd68021e2f2250a2d9aa53493ac73e7c1e
---

 LICENSE.md | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/LICENSE.md b/LICENSE.md
index a9b9f51c20..e2ab65cf5e 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -100,11 +100,23 @@ The following libraries are under GPL version 2:
 When combining them with FFmpeg, FFmpeg needs to be licensed as GPL as well by
 passing `--enable-gpl` to configure.
 
-The OpenCORE and VisualOn libraries are under the Apache License 2.0. That
-license is incompatible with the LGPL v2.1 and the GPL v2, but not with
+The following libraries are under LGPL version 3:
+- gmp
+- libaribb24
+- liblensfun
+
+When combining them with FFmpeg, use the configure option `--enable-version3` to
+upgrade FFmpeg to the LGPL v3.
+
+The VMAF, mbedTLS, RK MPI, OpenCORE and VisualOn libraries are under the Apache License
+2.0. That license is incompatible with the LGPL v2.1 and the GPL v2, but not with
 version 3 of those licenses. So to combine these libraries with FFmpeg, the
 license version needs to be upgraded by passing `--enable-version3` to configure.
 
+The smbclient library is under the GPL v3, to combine it with FFmpeg,
+the options `--enable-gpl` and `--enable-version3` have to be passed to
+configure to upgrade FFmpeg to the GPL v3.
+
 ### Incompatible libraries
 
 There are certain libraries you can combine with FFmpeg whose licenses are not



More information about the ffmpeg-cvslog mailing list