Merge svn changes up to r27850

5 files changed, 64 insertions, 115 deletions

diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml
index 3a5fb57527..bb63a39cc0 100644
--- a/DOCS/xml/en/codecs.xml
+++ b/DOCS/xml/en/codecs.xml
@@ -3,9 +3,6 @@
 <chapter id="codecs">
 <title>Codecs</title>
 
-<sect1 id="video-codecs">
-<title>Video codecs</title>
-
 <para>
 The <ulink url="../../codecs-status.html">codec status table</ulink> is a
 complete list of all supported codecs, regenerated daily.
@@ -20,36 +17,8 @@ please read the <link linkend="codec-importing">codec importing HOWTO</link>
 and help us add support for it.
 </para>
 
-<!-- ********** -->
-
-<sect2 id="ffmpeg" xreflabel="FFmpeg/libavcodec">
-<title>FFmpeg/libavcodec</title>
-
-<para>
-<ulink url="http://ffmpeg.org">FFmpeg</ulink> contains
-<systemitem class="library">libavcodec</systemitem>, the leading
-open source video and audio codec library. It is capable
-of decoding most multimedia formats, usually at higher speeds
-than the alternatives, and aims to add support for
-the rest of them eventually. It is the default decoder for
-the majority of codecs that <application>MPlayer</application>
-supports. Encoding is also possible for some formats and
-supported in <application>MEncoder</application>.
-</para>
-
-<para>
-For a complete list of supported 
-<ulink url="http://ffmpeg.mplayerhq.hu/general.html#SEC6">video</ulink>
-and <ulink url="http://ffmpeg.mplayerhq.hu/general.html#SEC7">audio</ulink>
-codecs please visit the FFmpeg homepage.
-</para>
-
-<para>
-<application>MPlayer</application> contains
-<systemitem class="library">libavcodec</systemitem>.
-Just run <filename>./configure</filename> and compile.
-</para>
-</sect2>
+<sect1 id="codec_installation">
+<title>Codec installation</title>
 
 <!-- ********** -->
 
@@ -124,6 +93,58 @@ Now rerun <filename>./configure</filename> for
 <systemitem class="library">x264</systemitem> support.
 </para>
 </sect2>
+
+<!-- ********** -->
+
+<sect2 id="aac">
+<title>AAC</title>
+
+<para>
+An open source AAC decoder called FAAD2 is available from
+<ulink url="http://www.audiocoding.com/downloads.html"/>.
+<application>MPlayer</application> includes a copy of it in its source tree.
+If you want to use the external library instead, install it and pass
+<option>--enable-faad-external</option> to <filename>./configure</filename>.
+</para>
+
+<para>
+FAAD2 binaries are not available from audiocoding.com, but you can (apt-)get
+Debian packages from
+<ulink url="http://www.debian-multimedia.org/">Christian Marillat</ulink>,
+Mandrake/Mandriva RPMs from the <ulink url="http://plf.zarb.org">P.L.F</ulink>
+and Fedora RPMs from <ulink url="http://rpm.livna.org/">Livna</ulink>.
+</para>
+<para>
+If you choose to build from source, you do not need all of FAAD2 to decode
+AAC files, libfaad is enough. Build it like this:
+<screen>
+cd faad2/
+sh bootstrap
+./configure
+cd libfaad
+make
+make install
+</screen>
+</para>
+</sect2>
+
+<!-- ********** -->
+
+<sect2 id="amr">
+<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.
+</para>
+</sect2>
+
 </sect1>
 
 
@@ -190,29 +211,6 @@ MPEG decoder cards.
 
 <!-- ********** -->
 
-<sect2 id="libmad">
-<title><systemitem class="library">libmad</systemitem> support</title>
-
-<para>
-<ulink url="http://www.underbit.com/products/mad/"><systemitem class="library">libmad</systemitem></ulink>
-is a multiplatform, integer (internally 24bit PCM) only
-MPEG audio decoding library. It does not handle broken files well, and it
-sometimes has problems with seeking, but it may perform better on FPU-less
-(such as <link linkend="arm">ARM</link>)
-platform than <systemitem class="library">mp3lib</systemitem>.
-</para>
-
-<para>
-If you have a proper installation of
-<systemitem class="library">libmad</systemitem>,
-<filename>./configure</filename> will notice and support for MPEG audio
-decoding via <systemitem class="library">libmad</systemitem> will be built
-automatically.
-</para>
-</sect2>
-
-<!-- ********** -->
-
 <sect2 id="hwmpa">
 <title>Hardware MPEG audio codec</title>
 
@@ -226,57 +224,6 @@ only white noise).
 </para>
 </sect2>
 
-<!-- ********** -->
-
-<sect2 id="aac">
-<title>AAC codec</title>
-
-<para>
-An open source AAC decoder called FAAD2 is available from
-<ulink url="http://www.audiocoding.com/downloads.html"/>.
-<application>MPlayer</application> includes a copy of it in its source tree.
-If you want to use the external library instead, install it and pass
-<option>--enable-faad-external</option> to <filename>./configure</filename>.
-</para>
-
-<para>
-FAAD2 binaries are not available from audiocoding.com, but you can (apt-)get
-Debian packages from
-<ulink url="http://www.debian-multimedia.org/">Christian Marillat</ulink>,
-Mandrake/Mandriva RPMs from the <ulink url="http://plf.zarb.org">P.L.F</ulink>
-and Fedora RPMs from <ulink url="http://rpm.livna.org/">Livna</ulink>.
-</para>
-<para>
-If you choose to build from source, you do not need all of FAAD2 to decode
-AAC files, libfaad is enough. Build it like this:
-<screen>
-cd faad2/
-sh bootstrap
-./configure
-cd libfaad
-make
-make install
-</screen>
-</para>
-</sect2>
-
-<!-- ********** -->
-
-<sect2 id="amr">
-<title>AMR codecs</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.
-</para>
-</sect2>
-
 </sect1>
 
 
diff --git a/DOCS/xml/en/documentation.xml b/DOCS/xml/en/documentation.xml
index 0d808d72a5..01f9b69f95 100644
--- a/DOCS/xml/en/documentation.xml
+++ b/DOCS/xml/en/documentation.xml
@@ -110,7 +110,7 @@ PCM/MP3/VBR MP3 audio.
 </para></listitem>
 <listitem><para>
   Encoding to all the codecs of FFmpeg's
-  <link linkend="ffmpeg"><systemitem class="library">libavcodec</systemitem></link>
+  <systemitem class="library">libavcodec</systemitem>
 </para></listitem>
 <listitem><para>
   Video encoding from V4L compatible TV tuners
diff --git a/DOCS/xml/en/encoding-guide.xml b/DOCS/xml/en/encoding-guide.xml
index a4a9fac526..5cf6d1a474 100644
--- a/DOCS/xml/en/encoding-guide.xml
+++ b/DOCS/xml/en/encoding-guide.xml
@@ -2433,7 +2433,7 @@ duration/location of each type.
   codec family</title>
 
 <para>
-<link linkend="ffmpeg"><systemitem class="library">libavcodec</systemitem></link>
+<systemitem class="library">libavcodec</systemitem>
 provides simple encoding to a lot of interesting video and audio formats.
 You can encode to the following codecs (more or less up to date):
 </para>
@@ -3071,7 +3071,7 @@ and development advancements, you may get very different results.
 
 <para>
 With this feature of
-<link linkend="ffmpeg"><systemitem class="library">libavcodec</systemitem></link>
+<systemitem class="library">libavcodec</systemitem>
 you are able to set custom inter (I-frames/keyframes) and intra
 (P-frames/predicted frames) matrices. It is supported by many of the codecs:
 <systemitem>mpeg1video</systemitem> and <systemitem>mpeg2video</systemitem>
diff --git a/DOCS/xml/en/install.xml b/DOCS/xml/en/install.xml
index 7503bffc43..1dd915f1cf 100644
--- a/DOCS/xml/en/install.xml
+++ b/DOCS/xml/en/install.xml
@@ -42,8 +42,7 @@ answers.
   You don't absolutely need X, some video output drivers work without it.
 </para></listitem>
 <listitem><para>
-  <emphasis role="bold">make</emphasis> - recommended version is
-  3.79.x or later. To build the XML documentation you need 3.80.
+  <emphasis role="bold">GNU make</emphasis> 3.81
 </para></listitem>
 <listitem><para>
   <emphasis role="bold">FreeType</emphasis> - 2.0.9 or later is required
@@ -70,8 +69,7 @@ answers.
   necessary for encoding MP3 audio with <application>MEncoder</application>.
 </para></listitem>
 <listitem><para>
-  <emphasis role="bold">zlib</emphasis> - recommended, necessary for compressed
-  MOV header and PNG support
+  <emphasis role="bold">zlib</emphasis> - recommended, many codecs use it.
 </para></listitem>
 <listitem><para>
   <emphasis role="bold"><ulink url="http://www.live555.com/mplayer/">LIVE555 Streaming Media</ulink></emphasis>
@@ -87,6 +85,10 @@ answers.
 <listitem><para>
   <emphasis role="bold">libsmb</emphasis> - optional, for SMB networking support
 </para></listitem>
+<listitem><para>
+  <emphasis role="bold"><ulink url="http://www.underbit.com/products/mad/">libmad</ulink></emphasis>
+  - optional, for for fast integer-only MP3 decoding on FPU-less platforms
+</para></listitem>
 </itemizedlist>
 </sect1>
 
diff --git a/DOCS/xml/en/mencoder.xml b/DOCS/xml/en/mencoder.xml
index 4646937345..5180a57d40 100644
--- a/DOCS/xml/en/mencoder.xml
+++ b/DOCS/xml/en/mencoder.xml
@@ -757,7 +757,7 @@ support this MPEG-4 attribute.
 
 <para>
 This feature can be used only with
-<link linkend="ffmpeg"><systemitem class="library">libavcodec</systemitem></link>'s
+<systemitem class="library">libavcodec</systemitem>'s
 <systemitem>mpeg4</systemitem> codec. Keep in mind: although
 <application>MPlayer</application> will correctly play the created file,
 other players may use the wrong aspect ratio.