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:
531f97b
)
The GPL-licensed optimizations in libswscale have been replaced.
author
Diego Biurrun
<diego@biurrun.de>
Sun, 30 May 2010 08:31:50 +0000
(08:31 +0000)
committer
Diego Biurrun
<diego@biurrun.de>
Sun, 30 May 2010 08:31:50 +0000
(08:31 +0000)
Originally committed as revision 23387 to svn://svn.ffmpeg.org/ffmpeg/trunk
LICENSE
patch
|
blob
|
history
diff --git
a/LICENSE
b/LICENSE
index
668350b
..
6aafde8
100644
(file)
--- a/
LICENSE
+++ b/
LICENSE
@@
-14,8
+14,6
@@
configure to activate them. In this case, FFmpeg's license changes to GPL v2+.
Specifically, the GPL parts of FFmpeg are
- libpostproc
-- 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