aboutsummaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-06-05 12:32:40 +0000
committerDiego Biurrun <diego@biurrun.de>2009-06-05 12:32:40 +0000
commit0b175caac811f3d1ee8a9b08b6e4754fed5cb7e3 (patch)
treecd067253d605ace6a6d2aca6d4436ce0ac2378c0 /LICENSE
parent9cad0e4ed827953634dfb895a4876fefa512a277 (diff)
downloadffmpeg-0b175caac811f3d1ee8a9b08b6e4754fed5cb7e3.tar.gz
Add support for external OpenCORE libraries for AMR-NB/WB support.
Originally committed as revision 19117 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE5
1 files changed, 5 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index 5817658978..8dc2c8953d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -39,6 +39,11 @@ Some external libraries, e.g. libx264, are under GPL and can be used in
conjunction with FFmpeg. They require --enable-gpl to be passed to configure
as well.
+The OpenCORE external libraries are under the Apache License 2.0. That license
+is incompatible with the LGPL v2.1 and the GPL v2, but not with version 3 of
+those licenses. So to combine the OpenCORE libraries with FFmpeg, the license
+version needs to be upgraded by passing --enable-version3 to configure.
+
The nonfree external libraries libamrnb, libamrwb and libfaac can be hooked up
in FFmpeg. You need to pass --enable-nonfree to configure to enable them. Employ
this option with care as FFmpeg then becomes nonfree and unredistributable.