X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=LICENSE;h=132970aac6e69f9a7a42e44080895391a5c5fcdc;hb=49891784ce70456305f19847d4188f07bbc1b6e1;hp=7272b90f8dc62b1cda768587fb14f05785ea693a;hpb=1d9569f9e8361c3be06b9732c0b80639a51b4b87;p=ffmpeg diff --git a/LICENSE b/LICENSE index 7272b90f8dc..132970aac6e 100644 --- a/LICENSE +++ b/LICENSE @@ -20,8 +20,12 @@ Specifically, the GPL parts of FFmpeg 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