[FFmpeg-cvslog] r18757 - in branches/0.5: . LICENSE configure

[diego]

Author: diego
Date: Wed May  6 14:12:05 2009
New Revision: 18757

Log:
Merge marking of libfaac as non-free from trunk.

Modified:
   branches/0.5/   (props changed)
   branches/0.5/LICENSE
   branches/0.5/configure

Modified: branches/0.5/LICENSE
==============================================================================
--- branches/0.5/LICENSE	Wed May  6 14:10:27 2009	(r18756)
+++ branches/0.5/LICENSE	Wed May  6 14:12:05 2009	(r18757)
@@ -23,9 +23,10 @@ Some external libraries, e.g. libx264, a
 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:
 

Modified: branches/0.5/configure
==============================================================================
--- branches/0.5/configure	Wed May  6 14:10:27 2009	(r18756)
+++ branches/0.5/configure	Wed May  6 14:12:05 2009	(r18757)
@@ -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