summaryrefslogtreecommitdiff
path: root/ffmpeg/LICENSE
diff options
context:
space:
mode:
Diffstat (limited to 'ffmpeg/LICENSE')
-rw-r--r--ffmpeg/LICENSE20
1 files changed, 16 insertions, 4 deletions
diff --git a/ffmpeg/LICENSE b/ffmpeg/LICENSE
index 38b1a5d..1840d69 100644
--- a/ffmpeg/LICENSE
+++ b/ffmpeg/LICENSE
@@ -33,12 +33,17 @@ Specifically, the GPL parts of FFmpeg are
- vf_geq.c
- vf_histeq.c
- vf_hqdn3d.c
- - vf_hue.c
- vf_kerndeint.c
+ - vf_mcdeint.c
- vf_mp.c
- - vf_noise.c
+ - vf_owdenoise.c
+ - vf_perspective.c
+ - vf_phase.c
- vf_pp.c
+ - vf_pullup.c
+ - vf_sab.c
- vf_smartblur.c
+ - vf_spp.c
- vf_stereo3d.c
- vf_super2xsai.c
- vf_tinterlace.c
@@ -69,8 +74,15 @@ affect the licensing of binaries resulting from the combination.
compatible libraries
--------------------
-The libcdio, libx264, libxavs and libxvid libraries are under GPL. When
-combining them with FFmpeg, FFmpeg needs to be licensed as GPL as well by
+The following libraries are under GPL:
+ - frei0r
+ - libcdio
+ - libutvideo
+ - libvidstab
+ - libx264
+ - libxavs
+ - libxvid
+When combining them with FFmpeg, FFmpeg needs to be licensed as GPL as well by
passing --enable-gpl to configure.
The OpenCORE and VisualOn libraries are under the Apache License 2.0. That