Merge svn changes up to r29532

5 files changed, 7 insertions, 25 deletions

diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 0d8ac1a73a..dc7a65febd 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -7809,10 +7809,6 @@ Adaptive PCM formats \- see the HTML documentation for details.
 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
diff --git a/DOCS/man/zh_CN/mplayer.1 b/DOCS/man/zh_CN/mplayer.1
index 874548068e..7e2685146a 100644
--- a/DOCS/man/zh_CN/mplayer.1
+++ b/DOCS/man/zh_CN/mplayer.1
@@ -1,4 +1,4 @@
-.\" sync with en/mplayer.1 r29413
+.\" sync with en/mplayer.1 r29461
 .\" Encoding: UTF-8
 .\" Reminder of hard terms which need better/final solution later:
 .\"   /capture; playtree in parent list; colorkey; retrace; desync; downmix;
@@ -7360,10 +7360,6 @@ Dolby Digital（AC-3）
 Free Lossless Audio Codec（FLAC，免费无损音频编解码器）
 .IPs "g726\ "
 G.726 ADPCM
-.IPs libamr_nb
-3GPP的自适应多码率（AMR）窄频段格式
-.IPs libamr_wb
-3GPP的自适应多码率（AMR）宽频段格式
 .IPs libfaac
 Advanced Audio Coding（AAC，高级音频编码）——使用FAAC
 .IPs libmp3lame
diff --git a/DOCS/tech/codecs.conf.txt b/DOCS/tech/codecs.conf.txt
index 4a949d0fd5..bc24c73030 100644
--- a/DOCS/tech/codecs.conf.txt
+++ b/DOCS/tech/codecs.conf.txt
@@ -133,6 +133,8 @@ static, query. The flags are defined as follows:
     Used for some very old DLLs like Indeo 3 and for some XAnim codecs like
     cinepak. See dr-methods.txt for details on buffer types.
 
+The "in" keyword -- UNDOCUMENTED
+
 Audio Codecs
 ------------
 Here is an example of a rather full-featured audio codec block:
diff --git a/DOCS/xml/en/encoding-guide.xml b/DOCS/xml/en/encoding-guide.xml
index 706b34dbf5..1c7c5909c5 100644
--- a/DOCS/xml/en/encoding-guide.xml
+++ b/DOCS/xml/en/encoding-guide.xml
@@ -2622,14 +2622,6 @@ mencoder dvd://2 -o <replaceable>title2.avi</replaceable> -ovc lavc -lavcopts vc
   <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>
diff --git a/DOCS/xml/en/install.xml b/DOCS/xml/en/install.xml
index 86afaaf65d..dd03e00377 100644
--- a/DOCS/xml/en/install.xml
+++ b/DOCS/xml/en/install.xml
@@ -448,14 +448,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>