[FFmpeg-cvslog] LICENSE: Move (L)GPLv3 explanation block to a more suitable place
Diego Biurrun
git at videolan.org
Thu Feb 28 13:07:40 CET 2013
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Wed Feb 27 19:34:14 2013 +0100| [e2c272eb3660d7f4f1d7720980e30f6a617e7eb3] | committer: Diego Biurrun
LICENSE: Move (L)GPLv3 explanation block to a more suitable place
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e2c272eb3660d7f4f1d7720980e30f6a617e7eb3
---
LICENSE | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/LICENSE b/LICENSE
index 1266627..1074989 100644
--- a/LICENSE
+++ b/LICENSE
@@ -23,6 +23,11 @@ Specifically, the GPL parts of Libav are
- vf_hqdn3d.c
- vf_yadif.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
+for you. Read the file COPYING.LGPLv3 or, if you have enabled GPL parts,
+COPYING.GPLv3 to learn the exact legal terms that apply in this case.
+
There are a handful of files under other licensing terms, namely:
* The files libavcodec/jfdctfst.c, libavcodec/jfdctint_template.c and
@@ -32,11 +37,6 @@ There are a handful of files under other licensing terms, namely:
You must also indicate any changes including additions and deletions to
those three files in the documentation.
-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
-for you. Read the file COPYING.LGPLv3 or, if you have enabled GPL parts,
-COPYING.GPLv3 to learn the exact legal terms that apply in this case.
-
external libraries
==================
More information about the ffmpeg-cvslog
mailing list