aboutsummaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-02-27 19:34:14 +0100
committerDiego Biurrun <diego@biurrun.de>2013-02-27 19:51:10 +0100
commite2c272eb3660d7f4f1d7720980e30f6a617e7eb3 (patch)
tree1ceb5bcf364baa50f711f1157a29e5affb17c4f4 /LICENSE
parent57c4c255966489a1c434b0725948a02ab121819f (diff)
downloadffmpeg-e2c272eb3660d7f4f1d7720980e30f6a617e7eb3.tar.gz
LICENSE: Move (L)GPLv3 explanation block to a more suitable place
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE10
1 files changed, 5 insertions, 5 deletions
diff --git a/LICENSE b/LICENSE
index 1266627f39..1074989bfc 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
==================