X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=LICENSE;h=132970aac6e69f9a7a42e44080895391a5c5fcdc;hb=50059bde77674977d9134f3c1151a63cb7a2391c;hp=7272b90f8dc62b1cda768587fb14f05785ea693a;hpb=4e04e1b81e4e31b7a11b3b5033ac97d2da3b866d;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