Merge marking of libfaac as non-free from trunk.

Originally committed as revision 18757 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

2 files changed, 5 insertions, 3 deletions

diff --git a/LICENSE b/LICENSE
index 7cb34d7597..7c0a3e71b6 100644
--- a/LICENSE
+++ b/LICENSE
@@ -23,9 +23,10 @@ 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 nonfree external libraries libamrnb and libamrwb 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.
+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.
+Note that libfaac claims to be LGPL, but is not.
 
 There are a handful of files under other licensing terms, namely:
 
diff --git a/configure b/configure
index 73d80f9e25..0db8a45888 100755
--- a/configure
+++ b/configure
@@ -1695,6 +1695,7 @@ die_license_disabled gpl x11grab
 
 die_license_disabled nonfree libamr_nb
 die_license_disabled nonfree libamr_wb
+die_license_disabled nonfree libfaac
 
 
 check_deps $ARCH_EXT_LIST