aboutsummaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authortipok <piratfm@gmail.com>2011-09-26 02:28:21 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-01 20:32:22 +0200
commitbe1ae17ec0e03b494e0ab9f1eedefe83cebd7f4e (patch)
tree60ee4c40888561e3f4d3bc17570de17f398a2884 /LICENSE
parentcdb72c827c4fc3d8a2dfe939654fa885aaedbbd1 (diff)
downloadffmpeg-be1ae17ec0e03b494e0ab9f1eedefe83cebd7f4e.tar.gz
libaac+ support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE6
1 files changed, 3 insertions, 3 deletions
diff --git a/LICENSE b/LICENSE
index 8d4d6515b0..7272b90f8d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -41,6 +41,6 @@ is incompatible with the LGPL v2.1 and the GPL v2, but not with version 3 of
those licenses. So to combine the OpenCORE libraries with FFmpeg, the license
version needs to be upgraded by passing --enable-version3 to configure.
-The nonfree external library libfaac can be hooked up in FFmpeg. You need to
-pass --enable-nonfree to configure to enable it. Employ this option with care
-as FFmpeg then becomes nonfree and unredistributable.
+The nonfree external libraries libfaac and libaacplus can be hooked up in FFmpeg.
+You need to pass --enable-nonfree to configure to enable it. Employ this option
+with care as FFmpeg then becomes nonfree and unredistributable.