diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-07-07 00:28:16 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-07-07 00:28:16 +0000 |
| commit | fc1206a4d95e24f8700eeb978a41419b7de64644 (patch) | |
| tree | e28c04431b3a20ef60d01649208dc6b101e02f63 /LICENSE | |
| parent | df2bd71aeb3e68509e3afc5502ef7cd6e5a69583 (diff) | |
Remove support for nonfree libamr library for AMR-NB/WB decoding/encoding.
libopencore can now be used as a replacement except for AMR-WB encoding.
Originally committed as revision 19365 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'LICENSE')
| -rw-r--r-- | LICENSE | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -44,6 +44,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 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. +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. |