From 24d150b77361b369b4d9105714df378e2ac1888c Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sun, 19 Feb 2012 17:03:55 +0100 Subject: Clarify licensing information about files borrowed from libjpeg. --- LICENSE | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'LICENSE') diff --git a/LICENSE b/LICENSE index 725995da56..293be1dcf6 100644 --- a/LICENSE +++ b/LICENSE @@ -20,8 +20,12 @@ Specifically, the GPL parts of Libav are 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. +* The files libavcodec/jfdctfst.c, libavcodec/jfdctint_template.c and + libavcodec/jrevdct.c are taken from libjpeg, see the top of the files for + licensing details. Specifically note that you must credit the IJG in the + documentation accompanying your program if you only distribute executables. + 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 -- cgit v1.2.3