From 6056c939fcf82ec50b949156dedc74058b631d7a Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 12 Apr 2007 11:05:38 +0000 Subject: Update AMR instructions for last round of changes. Originally committed as revision 8718 to svn://svn.ffmpeg.org/ffmpeg/trunk --- doc/ffmpeg-doc.texi | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'doc') diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi index 3db5685..d28bddf 100644 --- a/doc/ffmpeg-doc.texi +++ b/doc/ffmpeg-doc.texi @@ -798,22 +798,16 @@ fixed-point mode) reference decoders and encoders. @itemize -@item For AMR WB floating-point download TS26.204 V5.1.0 from -@url{http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-510.zip} -and extract the source to @file{libavcodec/amrwb_float/}. - -@item For AMR NB floating-point download TS26.104 REL-5 V5.1.0 from -@url{http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-510.zip} -and extract the source to @file{libavcodec/amr_float/}. -If you try this on Alpha, you may need to change @code{Word32} to -@code{int} in @file{amr/typedef.h}. - -@item For AMR NB fixed-point download TS26.073 REL-5 V5.1.0 from -@url{http://www.3gpp.org/ftp/Specs/archive/26_series/26.073/26073-510.zip} -and extract the source to @file{libavcodec/amr}. -You must also add @code{-DMMS_IO} and remove @code{-pedantic-errors} -to/from @code{CFLAGS} in @file{libavcodec/amr/makefile}, i.e. -``@code{CFLAGS = -Wall -I. \$(CFLAGS_\$(MODE)) -D\$(VAD) -DMMS_IO}''. +@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. + +@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} from @code{CFLAGS} in +@file{libavcodec/amr/makefile}, i.e. +``@code{CFLAGS = -Wall -pedantic-errors -I. $(CFLAGS_$(MODE)) -D$(VAD) -DMMS_IO}''. @end itemize -- cgit v1.1