summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-06-05 11:04:03 +0000
committerDiego Biurrun <diego@biurrun.de>2009-06-05 11:04:03 +0000
commit9cad0e4ed827953634dfb895a4876fefa512a277 (patch)
tree2b51f4c7a6598a01fb50ec0ec64ad85bdc988b7e /LICENSE
parent4656c375bc21368b2801977595c6b13e4302b4b8 (diff)
downloadffmpeg-9cad0e4ed827953634dfb895a4876fefa512a277.tar.gz
Add configure option to upgrade (L)GPL to version 3.
Originally committed as revision 19116 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE5
1 files changed, 5 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index 68f0f09192..5817658978 100644
--- a/LICENSE
+++ b/LICENSE
@@ -26,6 +26,11 @@ There are a handful of files under other licensing terms, namely:
* The files libavcodec/jfdctfst.c, libavcodec/jfdctint.c, libavcodec/jrevdct.c
are taken from libjpeg, see the top of the files for licensing details.
+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:
-------------------