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

[Timothy Gu]

ffmpeg | branch: release/1.2 | Timothy Gu <timothygu99 at gmail.com> | Tue Jun 11 16:52:12 2013 -0700| [f637fa5d334a3207f6c3b29656cd3045f6ecfb09] | committer: Timothy Gu

doc/general: Make the license status of the Android libraries clearer

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6fe419bf73146655961a373c734e9e4d8826c835)

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f637fa5d334a3207f6c3b29656cd3045f6ecfb09
---

 doc/general.texi |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/doc/general.texi b/doc/general.texi
index 39b9360..086a280 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -24,7 +24,7 @@ instructions.  To enable using OpenJPEG in FFmpeg, pass @code{--enable-libopenjp
 @file{./configure}.
 
 
- 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.
@@ -32,9 +32,14 @@ libraries provide encoders for a number of audio codecs.
 @float NOTE
 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
+incompatible to 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