RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move AMR support instructions into the documentation. 

Originally committed as revision 7055 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2006-11-14 11:41:31 +00:00
parent 0e6045d776
commit 47404f9fd5
2 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
configure vendored
View File

@ -1767,33 +1767,6 @@ else
echo "License: GPL"
fi
if test "$amr_wb" = "yes" ; then
echo
echo "AMR WB FLOAT NOTICE ! Make sure you have downloaded TS26.204"
echo "V5.1.0 from "
echo "http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-510.zip"
echo "and extracted the source to libavcodec/amrwb_float"
fi
if test "$amr_nb" = "yes" ; then
echo
echo "AMR NB FLOAT NOTICE ! Make sure you have downloaded TS26.104"
echo "REL-5 V5.1.0 from "
echo "http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-510.zip"
echo "and extracted the source to libavcodec/amr_float"
echo "If you try this on alpha, you may need to change Word32 to int in amr/typedef.h"
fi
if test "$amr_nb_fixed" = "yes" ; then
echo
echo "AMR NB FIXED POINT NOTICE! Make sure you have downloaded TS26.073 "
echo "REL-5 version 5.1.0 from "
echo "http://www.3gpp.org/ftp/Specs/archive/26_series/26.073/26073-510.zip"
echo "and extracted src to libavcodec/amr"
echo "You must also add -DMMS_IO and remove -pedantic-errors to/from CFLAGS in libavcodec/amr/makefile."
echo "i.e. CFLAGS = -Wall -I. \$(CFLAGS_\$(MODE)) -D\$(VAD) -DMMS_IO"
fi
echo "Creating config.mak and config.h..."
date >> config.log

34
doc/ffmpeg-doc.texi
View File

@ -754,6 +754,40 @@ It allows almost lossless encoding.
@end itemize
@chapter external libraries
FFmpeg can be hooked up with a number of external libraries to add support
for more formats.
@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.
@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}''.
@end itemize
@chapter Supported File Formats and Codecs
You can use the @code{-formats} option to have an exhaustive list.