aboutsummaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2010-03-27 11:31:30 +0000
committerDiego Biurrun <diego@biurrun.de>2010-03-27 11:31:30 +0000
commitc271ad21acdebdb7d80598a14668a8358849b740 (patch)
treeb8879a469d915b6547d1a2d0f3c5afc8ec8d0e13 /LICENSE
parent819ee683d81b01691317560252648068ad8179d5 (diff)
downloadffmpeg-c271ad21acdebdb7d80598a14668a8358849b740.tar.gz
Clarify which parts of libswscale remain GPL.
Originally committed as revision 22697 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE3
1 files changed, 2 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index 7a94f8db5f..668350b185 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