From fc1206a4d95e24f8700eeb978a41419b7de64644 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 7 Jul 2009 00:28:16 +0000 Subject: 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 --- LICENSE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'LICENSE') diff --git a/LICENSE b/LICENSE index ca5bc30bdc..7a94f8db5f 100644 --- a/LICENSE +++ b/LICENSE @@ -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. -- cgit v1.2.3