diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-01-04 15:20:52 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-01-04 15:20:52 +0000 |
| commit | 68e7d4427665fb196f5563ab4053b1ef585ae49c (patch) | |
| tree | b4c3f21464a37e790f5b97a0c57ab448a90ae587 | |
| parent | 50e4d833fe54776792e19215c0e7320cc402d7bc (diff) | |
| download | ffmpeg-68e7d4427665fb196f5563ab4053b1ef585ae49c.tar.gz | |
Add a note about the license of libamr.
Originally committed as revision 11396 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | doc/general.texi | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi index 0e8c806ded..72c6ac9035 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -24,6 +24,11 @@ Go to @url{http://www.penguin.cz/~utx/amr} and follow the instructions for installing the libraries. Then pass @code{--enable-libamr-nb} and/or @code{--enable-libamr-wb} to configure to enable the libraries. +Note that libamr is copyrighted without any sort of license grant. This means +that you can use it if you legally obtained it but you are not allowed to +redistribute it in any way. @strong{Any FFmpeg binaries with libamr support +you create are non-free and unredistributable!} + @chapter Supported File Formats and Codecs |