aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2007-04-25 19:12:04 +0000
committerDiego Biurrun <diego@biurrun.de>2007-04-25 19:12:04 +0000
commit73508bc6d30b397f33fa7f88089a4d2298aa5ea2 (patch)
tree2f1f01ff6da165767007b5f88f29dde4dacb706a /doc
parent8d27c5f891ad4b7f507f88489b9a987b824f88d8 (diff)
downloadffmpeg-73508bc6d30b397f33fa7f88089a4d2298aa5ea2.tar.gz
Remove hackish support for the non-free fixed-point AMR-NB reference code.
Originally committed as revision 8813 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc')
-rw-r--r--doc/ffmpeg-doc.texi23
1 files changed, 5 insertions, 18 deletions
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 2d6ad5485d..673275930d 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -844,25 +844,12 @@ explicitly requested by passing the appropriate flags to @file{./configure}.
@section AMR
AMR comes in two different flavors, WB and NB. FFmpeg can make use of the
-AMR WB (floating-point mode) and the AMR NB (both floating-point and
-fixed-point mode) reference decoders and encoders.
+AMR WB (floating-point mode) and the AMR NB (floating-point mode) reference
+decoders and encoders.
-@itemize
-
-@item For AMR WB floating-point and AMR NB floating point support, go to
-@url{http://www.penguin.cz/~utx/amr} and follow the instructions for building
-the libraries. Pass @code{--enable-amr-nb} and/or @code{--enable-amr-wb} to
-configure to enable the libraries.
-
-@item For AMR NB fixed-point download TS26.073 REL-6 V6.0.0 from
-@url{http://www.3gpp.org/ftp/Specs/archive/26_series/26.073/26073-600.zip}
-and extract the source to the directory @file{libavcodec/amr}.
-You must also add @code{-DMMS_IO} to @code{CFLAGS} in
-@file{libavcodec/amr/makefile}, i.e.
-``@code{CFLAGS = -Wall -pedantic-errors -I. $(CFLAGS_$(MODE)) -D$(VAD) -DMMS_IO}''.
-Pass @code{--enable-amr-nb-fixed} to configure to enable it.
-
-@end itemize
+Go to @url{http://www.penguin.cz/~utx/amr} and follow the instructions for
+installing the libraries. Then pass @code{--enable-amr-nb} and/or
+@code{--enable-amr-wb} to configure to enable the libraries.
@chapter Supported File Formats and Codecs