[FFmpeg-devel] [PATCH] doc/general: Make the license status of the Android libraries clearer

Timothy Gu timothygu99 at gmail.com
Tue Jun 11 05:00:13 CEST 2013

 doc/general.texi | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/doc/general.texi b/doc/general.texi
index 35a49bf..6e1b36d 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -24,7 +24,7 @@ instructions.  To enable using OpenJPEG in FFmpeg, pass @code{--enable-libopenjp
- at section OpenCORE and VisualOn libraries
+ at section OpenCORE, VisualOn, and Fraunhofer libraries
 Spun off Google Android sources, OpenCore, VisualOn and Fraunhofer
 libraries provide encoders for a number of audio codecs.
@@ -34,7 +34,12 @@ OpenCORE and VisualOn libraries are under the Apache License 2.0
 (see @url{http://www.apache.org/licenses/LICENSE-2.0} for details), which is
 incompatible with the LGPL version 2.1 and GPL version 2. You have to
 upgrade FFmpeg's license to LGPL version 3 (or if you have enabled
-GPL components, GPL version 3) to use it.
+GPL components, GPL version 3) by passing @code{--enable-version3} to configure in
+order to use it.
+The Fraunhofer AAC library is licensed under a license incompatible to the GPL
+and is not known to be compatible to the LGPL. Therefore, you have to pass
+ at code{--enable-nonfree} to configure to use it.
 @end float
 @subsection OpenCORE AMR

More information about the ffmpeg-devel mailing list