fix get_str16_nolen with odd len, fix #1065

[frescor/ffmpeg.git] / LICENSE

diff --git a/LICENSE b/LICENSE
index 7cb34d7597a187d0e34d61dba5cf90de3e76db8d..929f65bebc6c7ba8b364d4f5cd582da2cffba2f8 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -16,16 +16,16 @@ Specifically, the GPL parts of FFmpeg are
   libavcodec/x86/h264_deblock_sse2.asm
   libavcodec/x86/h264_idct_sse2.asm
   libavcodec/x86/idct_mmx.c
-- the AC-3 decoder in libavcodec/ac3dec.c
 - the X11 grabber in libavdevice/x11grab.c
 
 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: