diff options
author | Diego Biurrun <diego@biurrun.de> | 2009-05-04 11:37:25 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2009-05-04 11:37:25 +0000 |
commit | c7279693ae4224419ad567b4229906f1e677e4dd (patch) | |
tree | c724d0b4394584acb78157b7ab775fc7279808d0 /LICENSE | |
parent | 5b05059d2d1d66600c0bfa97271c3603d9907f4f (diff) | |
download | ffmpeg-streaming-c7279693ae4224419ad567b4229906f1e677e4dd.zip ffmpeg-streaming-c7279693ae4224419ad567b4229906f1e677e4dd.tar.gz |
Add note about nonfree license of libfaac.
Originally committed as revision 18735 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'LICENSE')
-rw-r--r-- | LICENSE | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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: |