OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
819ee68
)
Clarify which parts of libswscale remain GPL.
author
Diego Biurrun
<diego@biurrun.de>
Sat, 27 Mar 2010 11:31:30 +0000
(11:31 +0000)
committer
Diego Biurrun
<diego@biurrun.de>
Sat, 27 Mar 2010 11:31:30 +0000
(11:31 +0000)
Originally committed as revision 22697 to svn://svn.ffmpeg.org/ffmpeg/trunk
LICENSE
patch
|
blob
|
history
diff --git
a/LICENSE
b/LICENSE
index
7a94f8d
..
668350b
100644
(file)
--- 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