[FFmpeg-cvslog] Clarify licensing information about files borrowed from libjpeg.

Diego Biurrun git at videolan.org
Wed Feb 22 03:01:50 CET 2012


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Sun Feb 19 17:03:55 2012 +0100| [24d150b77361b369b4d9105714df378e2ac1888c] | committer: Diego Biurrun

Clarify licensing information about files borrowed from libjpeg.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=24d150b77361b369b4d9105714df378e2ac1888c
---

 LICENSE |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/LICENSE b/LICENSE
index 725995d..293be1d 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



More information about the ffmpeg-cvslog mailing list