diff options
author | Diego Biurrun <diego@biurrun.de> | 2012-02-19 17:03:55 +0100 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2012-02-21 20:17:56 +0100 |
commit | 24d150b77361b369b4d9105714df378e2ac1888c (patch) | |
tree | ef22dc4343900aac9014c4498a2bb4920a569e3b /LICENSE | |
parent | b0f29db5c2b8d1b7de2ccac815e33090e8c49cff (diff) | |
download | ffmpeg-24d150b77361b369b4d9105714df378e2ac1888c.tar.gz |
Clarify licensing information about files borrowed from libjpeg.
Diffstat (limited to 'LICENSE')
-rw-r--r-- | LICENSE | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -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 |