X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=LICENSE;h=1eae4e7de7926cd2d6fd807aa316f8aeeebc46e4;hb=5fcae3b3f93fd02b3d1e009b9d9b17410fca9498;hp=20d82c392e945a01c0e76e42ddcf18de39bd03d8;hpb=d8e763fda77242a77732b6e537facb1de9029c05;p=ffmpeg diff --git a/LICENSE b/LICENSE index 20d82c392e9..1eae4e7de79 100644 --- a/LICENSE +++ b/LICENSE @@ -21,6 +21,7 @@ Specifically, the GPL parts of Libav are - vf_cropdetect.c - vf_delogo.c - vf_hqdn3d.c + - vf_interlace.c 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 @@ -46,7 +47,7 @@ affect the licensing of binaries resulting from the combination. compatible libraries -------------------- -The libcdio, libx264, libxavs and libxvid libraries are under GPL. When +The libcdio, libx264, libx265, libxavs and libxvid libraries are under GPL. When combining them with Libav, Libav needs to be licensed as GPL as well by passing --enable-gpl to configure. @@ -61,5 +62,5 @@ incompatible libraries The Fraunhofer AAC library, FAAC and OpenSSL are under licenses incompatible with all (L)GPL versions. Thus, unfortunately, since both licenses cannot be satisfied simultaneously, binaries resulting from the combination of Libav -with these libraries are nonfree und unredistributable. If you wish to enable +with these libraries are nonfree and unredistributable. If you wish to enable any of these libraries nonetheless, pass --enable-nonfree to configure.