[SCM] libav/master: license: Mention that vf_interlace is GPL, not LGPL
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Wed Sep 17 01:18:10 UTC 2014
The following commit has been merged in the master branch:
commit 4cde8bae49275edb2815b98cc3404238bb5799dd
Author: Diego Biurrun <diego at biurrun.de>
Date: Wed Aug 27 13:14:20 2014 +0200
license: Mention that vf_interlace is GPL, not LGPL
(cherry picked from commit 9e8bbe7d4d1dcd5fec491dbfbb98ed2038a7bed5)
Signed-off-by: Diego Biurrun <diego at biurrun.de>
diff --git a/LICENSE b/LICENSE
index fb29178..701e6e1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -21,6 +21,7 @@ Specifically, the GPL parts of Libav are
- vf_cropdetect.c
- vf_delogo.c
- vf_hqdn3d.c
+ - vf_interlace.c
Should you, for whatever reason, prefer to use version 3 of the (L)GPL, then
the configure parameter --enable-version3 will activate this licensing option
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list