From: Diego Biurrun <diego@biurrun.de>
Date: Sun, 19 Feb 2012 16:03:55 +0000 (+0100)
Subject: Clarify licensing information about files borrowed from libjpeg.
X-Git-Tag: android-x86-4.4-r1~8529^2~3068
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=24d150b77361b369b4d9105714df378e2ac1888c;p=android-x86%2Fexternal-ffmpeg.git

Clarify licensing information about files borrowed from libjpeg.
---

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