diff options
author | Diego Biurrun <diego@biurrun.de> | 2009-06-07 20:14:56 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2009-06-07 20:14:56 +0000 |
commit | 9ad437eafbb34cedbc9c07f24f9143d9d53e839f (patch) | |
tree | 76ed87541006c3ab72e2b0059cb508f5c090ae9f /LICENSE | |
parent | 4fcef88c4d015da8e8ba8c2298c24d73eb95e73c (diff) |
Merge OpenCORE AMR support from trunk.
Originally committed as revision 19133 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
Diffstat (limited to 'LICENSE')
-rw-r--r-- | LICENSE | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -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. |