summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-07-20 10:45:03 +0000
committerDiego Biurrun <diego@biurrun.de>2009-07-20 10:45:03 +0000
commit87a844316ce4344965e73ef37d998c3094f2286b (patch)
treedd4e0adc90cbeeec508934cc59a1b22aff43d77f /doc
parente82dc4c91e604c29802344959628f1114815ebd3 (diff)
Merge AMR and OpenCORE documentation sections.
Originally committed as revision 19469 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc')
-rw-r--r--doc/general.texi8
1 files changed, 3 insertions, 5 deletions
diff --git a/doc/general.texi b/doc/general.texi
index d855d4e138..4202c1d220 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -14,12 +14,10 @@ FFmpeg can be hooked up with a number of external libraries to add support
for more formats. None of them are used by default, their use has to be
explicitly requested by passing the appropriate flags to @file{./configure}.
-@section AMR
+@section OpenCORE AMR
-AMR comes in two different flavors, wideband and narrowband. FFmpeg can make
-use of the OpenCORE libraries for AMR-NB decoding/encoding and AMR-WB decoding.
-
-@subsection OpenCORE
+FFmpeg can make use of the OpenCORE libraries for AMR-NB
+decoding/encoding and AMR-WB decoding.
Go to @url{http://sourceforge.net/projects/opencore-amr/} and follow the instructions for
installing the libraries. Then pass @code{--enable-libopencore-amrnb} and/or