X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=LICENSE;h=668350b185c1db4038565526ff6b80387e9480ad;hb=bf29cbc2cc771e544174f87c5563f85a060f93b9;hp=58176589784ef3567ca6e58001a0fd8042e2d539;hpb=9cad0e4ed827953634dfb895a4876fefa512a277;p=ffmpeg

diff --git a/LICENSE b/LICENSE
index 58176589784..668350b185c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -14,7 +14,8 @@ configure to activate them. In this case, FFmpeg's license changes to GPL v2+.
 Specifically, the GPL parts of FFmpeg are
 
 - libpostproc
-- some x86 optimizations in libswscale
+- optional MMX optimizations for YUV to RGB colorspace conversion in
+  libswscale/x86/yuv2rgb_template.c
 - optional x86 optimizations in the files
   libavcodec/x86/h264_deblock_sse2.asm
   libavcodec/x86/h264_idct_sse2.asm
@@ -39,7 +40,11 @@ Some external libraries, e.g. libx264, are under GPL and can be used in
 conjunction with FFmpeg. They require --enable-gpl to be passed to configure
 as well.
 
-The nonfree external libraries libamrnb, libamrwb and libfaac can be hooked up
-in FFmpeg. You need to pass --enable-nonfree to configure to enable them. Employ
-this option with care as FFmpeg then becomes nonfree and unredistributable.
-Note that libfaac claims to be LGPL, but is not.
+The OpenCORE external libraries are under the Apache License 2.0. That license
+is incompatible with the LGPL v2.1 and the GPL v2, but not with version 3 of
+those licenses. So to combine the OpenCORE libraries with FFmpeg, the license
+version needs to be upgraded by passing --enable-version3 to configure.
+
+The nonfree external library libfaac can be hooked up in FFmpeg. You need to
+pass --enable-nonfree to configure to enable it. Employ this option with care
+as FFmpeg then becomes nonfree and unredistributable.