diff options
| author | tipok <piratfm@gmail.com> | 2011-09-26 02:28:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-26 02:28:21 +0200 |
| commit | cbf914cf16c1adf872a407a767bc171846a60905 (patch) | |
| tree | ba5cdc3d794d40e7b88bb1748fac1f699d679b3c /LICENSE | |
| parent | 023e9960d711980c8d7ddda4e15efc379977d3c6 (diff) | |
| download | ffmpeg-cbf914cf16c1adf872a407a767bc171846a60905.tar.gz | |
libaac+ support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'LICENSE')
| -rw-r--r-- | LICENSE | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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. |