aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2012-08-03 21:29:38 -0400
committerMichael Niedermayer <michaelni@gmx.at>2012-08-04 04:03:08 +0200
commit878b3f2a2416c87fd14ecc4a4c4fac6a4b70bb5d (patch)
treec5350ad1b5003e4496ef98b716320ac0c974e294
parent668c873bedfe9cf415153c3126c8e75d4ec712aa (diff)
downloadffmpeg-878b3f2a2416c87fd14ecc4a4c4fac6a4b70bb5d.tar.gz
LICENSE: Document all GPL files
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--LICENSE10
1 files changed, 10 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index 42ca86908a..1607742b0c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -14,17 +14,27 @@ configure to activate them. In this case, FFmpeg's license changes to GPL v2+.
Specifically, the GPL parts of FFmpeg are
- libpostproc
+- libmpcodecs
- optional x86 optimizations in the files
libavcodec/x86/idct_mmx.c
+- libutvideo encoding/decoding wrappers in
+ libavcodec/libutvideo*.cpp
- the X11 grabber in libavdevice/x11grab.c
+- the swresample test app in
+ libswresample/swresample-test.c
- the texi2pod.pl tool
- the following filters in libavfilter:
- vf_blackframe.c
- vf_boxblur.c
+ - vf_colormatrix.c
- vf_cropdetect.c
- vf_delogo.c
- vf_hqdn3d.c
+ - vf_mp.c
+ - vf_super2xsai.c
+ - vf_tinterlace.c
- vf_yadif.c
+ - vsrc_mptestsrc.c
There are a handful of files under other licensing terms, namely: