[FFmpeg-cvslog] doc/general.texi: clarify FDK-AAC licensing & usability
Gyan Doshi
git at videolan.org
Thu Jun 7 14:37:27 EEST 2018
ffmpeg | branch: master | Gyan Doshi <ffmpeg at gyani.pro> | Thu Jun 7 17:22:56 2018 +0530| [47a818323ba0fea16667031e0788756960a308ea] | committer: Gyan Doshi
doc/general.texi: clarify FDK-AAC licensing & usability
Mnetion it can be used to decode as well.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=47a818323ba0fea16667031e0788756960a308ea
---
doc/general.texi | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/doc/general.texi b/doc/general.texi
index 2583006b14..8c3a04b078 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -46,9 +46,10 @@ upgrade FFmpeg's license to LGPL version 3 (or if you have enabled
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.
+The license of the Fraunhofer AAC library is incompatible with the GPL.
+Therefore, for GPL builds, you have to pass @code{--enable-nonfree} to
+configure in order to use it. To the best of our knowledge, it is
+compatible with the LGPL.
@end float
@subsection OpenCORE AMR
@@ -71,7 +72,7 @@ Then pass @code{--enable-libvo-amrwbenc} to configure to enable it.
@subsection Fraunhofer AAC library
-FFmpeg can make use of the Fraunhofer AAC library for AAC encoding.
+FFmpeg can make use of the Fraunhofer AAC library for AAC decoding & encoding.
Go to @url{http://sourceforge.net/projects/opencore-amr/} and follow the
instructions for installing the library.
More information about the ffmpeg-cvslog
mailing list