[MPlayer-DOCS] r29461 - in trunk/DOCS: man/en/mplayer.1 xml/en/encoding-guide.xml xml/en/install.xml

[diego]

Author: diego
Date: Thu Jul 30 22:10:16 2009
New Revision: 29461

Log:
Update documentation for libamr replacement by OpenCORE in FFmpeg.

Modified:
   trunk/DOCS/man/en/mplayer.1
   trunk/DOCS/xml/en/encoding-guide.xml
   trunk/DOCS/xml/en/install.xml

Modified: trunk/DOCS/man/en/mplayer.1
==============================================================================
--- trunk/DOCS/man/en/mplayer.1	Thu Jul 30 14:08:20 2009	(r29460)
+++ trunk/DOCS/man/en/mplayer.1	Thu Jul 30 22:10:16 2009	(r29461)
@@ -7860,10 +7860,6 @@ Adaptive PCM formats \- see the HTML doc
 Free Lossless Audio Codec (FLAC)
 .IPs "g726\ "
 G.726 ADPCM
-.IPs libamr_nb
-3GPP Adaptive Multi-Rate (AMR) narrow-band
-.IPs libamr_wb
-3GPP Adaptive Multi-Rate (AMR) wide-band
 .IPs libfaac
 Advanced Audio Coding (AAC) \- using FAAC
 .IPs libmp3lame

Modified: trunk/DOCS/xml/en/encoding-guide.xml
==============================================================================
--- trunk/DOCS/xml/en/encoding-guide.xml	Thu Jul 30 14:08:20 2009	(r29460)
+++ trunk/DOCS/xml/en/encoding-guide.xml	Thu Jul 30 22:10:16 2009	(r29461)
@@ -2622,14 +2622,6 @@ mencoder dvd://2 -o <replaceable>title2.
   <entry>G.726 ADPCM</entry>
 </row>
 <row>
-  <entry>libamr_nb</entry>
-  <entry>3GPP Adaptive Multi-Rate (AMR) narrow-band</entry>
-</row>
-<row>
-  <entry>libamr_wb</entry>
-  <entry>3GPP Adaptive Multi-Rate (AMR) wide-band</entry>
-</row>
-<row>
   <entry>libfaac</entry>
   <entry>Advanced Audio Coding (AAC) - using FAAC</entry>
 </row>

Modified: trunk/DOCS/xml/en/install.xml
==============================================================================
--- trunk/DOCS/xml/en/install.xml	Thu Jul 30 14:08:20 2009	(r29460)
+++ trunk/DOCS/xml/en/install.xml	Thu Jul 30 22:10:16 2009	(r29461)
@@ -469,14 +469,10 @@ make install
 <title>AMR</title>
 
 <para>
-Adaptive Multi-Rate speech codec is used in third generation (3G) mobile
-phones.
-Reference implementation is available from
-<ulink url="http://www.3gpp.org">The 3rd Generation Partnership Project</ulink>
-(free for private use).
-To enable support, download and install support libraries for
-<ulink url="http://www.penguin.cz/~utx/amr">AMR-NB and AMR-WB</ulink>
-following the instructions on that page. Recompile MPlayer afterwards.
+MPlayer can use the OpenCORE AMR libraries through FFmpeg.
+Download the libraries for AMR-NB and AMR-WB from the
+<ulink url="http://sourceforge.net/projects/opencore-amr/">opencore-amr</ulink>
+project and install them according to the instructions on that page.
 </para>
 </sect2>