Author: diego Date: Thu Oct 30 10:06:34 2008 New Revision: 27852 Log: Move codec installation instructions from the codecs section to a more sensible place in the installation section. Modified: trunk/DOCS/xml/en/codecs.xml trunk/DOCS/xml/en/install.xml Modified: trunk/DOCS/xml/en/codecs.xml ============================================================================== --- trunk/DOCS/xml/en/codecs.xml (original) +++ trunk/DOCS/xml/en/codecs.xml Thu Oct 30 10:06:34 2008 @@ -17,154 +17,6 @@ please read the <link linkend="codec-imp and help us add support for it. </para> -<sect1 id="codec_installation"> -<title>Codec installation</title> - -<!-- ********** --> - -<sect2 id="xvid"> -<title>Xvid</title> - -<para> -<ulink url="http://www.xvid.org">Xvid</ulink> is a free software MPEG-4 ASP -compliant video codec. Note that Xvid is not necessary to decode Xvid-encoded -video. <systemitem class="library">libavcodec</systemitem> is used by -default as it offers better speed. -</para> - -<procedure> -<title>Installing <systemitem class="library">Xvid</systemitem></title> -<para> - Like most open source software, it is available in two flavors: - <ulink url="http://www.xvid.org/downloads.html">official releases</ulink> - and the CVS version. - The CVS version is usually stable enough to use, as most of the time it - features fixes for bugs that exist in releases. - Here is what to do to make <systemitem class="library">Xvid</systemitem> - CVS work with <application>MEncoder</application>: -</para> -<step><para> - <screen>cvs -z3 -d:pserver:anonymous@cvs.xvid.org:/xvid login</screen> -</para></step> -<step><para> - <screen>cvs -z3 -d:pserver:anonymous@cvs.xvid.org:/xvid co xvidcore</screen> -</para></step> -<step><para> - <screen>cd xvidcore/build/generic</screen> -</para></step> -<step><para> - <screen>./bootstrap.sh && ./configure</screen> - You may have to add some options (examine the output of - <command>./configure --help</command>). -</para></step> -<step><para> - <screen>make && make install</screen> -</para></step> -<step><para> - Recompile <application>MPlayer</application>. -</para></step> -</procedure> -</sect2> - -<!-- ********** --> - -<sect2 id="codec-x264"> -<title><systemitem class="library">x264</systemitem></title> - -<para> -<ulink url="http://developers.videolan.org/x264.html"><systemitem class="library">x264</systemitem></ulink> -is a library for creating H.264 video. -<application>MPlayer</application> sources are updated whenever -an <systemitem class="library">x264</systemitem> API change -occurs, so it is always suggested to use -<application>MPlayer</application> from Subversion. -</para> - -<para> -If you have a GIT client installed, the latest x264 -sources can be gotten with this command: -<screen>git clone git://git.videolan.org/x264.git</screen> - -Then build and install in the standard way: -<screen>./configure && make && make install</screen> - -Now rerun <filename>./configure</filename> for -<application>MPlayer</application> to pick up -<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> - -<sect2 id="xmms"> -<title>XMMS</title> - -<para> -<application>MPlayer</application> can use <application>XMMS</application> input -plugins to play many file formats. There are plugins for SNES game tunes, SID -tunes (from Commodore 64), many Amiga formats, .xm, .it, VQF, Musepack, Bonk, -shorten and many others. You can find them at the -<ulink url="http://www.xmms.org/plugins.php?category=input">XMMS input plugin page</ulink>. -</para> - -<para> -For this feature you need to have <application>XMMS</application> and compile -<application>MPlayer</application> with -<filename>./configure --enable-xmms</filename>. -</para> -</sect2> - -</sect1> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> Modified: trunk/DOCS/xml/en/install.xml ============================================================================== --- trunk/DOCS/xml/en/install.xml (original) +++ trunk/DOCS/xml/en/install.xml Thu Oct 30 10:06:34 2008 @@ -347,6 +347,158 @@ the Preferences menu is currently UNIMPL <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> +<sect1 id="codec_installation"> +<title>Codec installation</title> + +<!-- ********** --> + +<sect2 id="xvid"> +<title>Xvid</title> + +<para> +<ulink url="http://www.xvid.org">Xvid</ulink> is a free software MPEG-4 ASP +compliant video codec. Note that Xvid is not necessary to decode Xvid-encoded +video. <systemitem class="library">libavcodec</systemitem> is used by +default as it offers better speed. +</para> + +<procedure> +<title>Installing <systemitem class="library">Xvid</systemitem></title> +<para> + Like most open source software, it is available in two flavors: + <ulink url="http://www.xvid.org/downloads.html">official releases</ulink> + and the CVS version. + The CVS version is usually stable enough to use, as most of the time it + features fixes for bugs that exist in releases. + Here is what to do to make <systemitem class="library">Xvid</systemitem> + CVS work with <application>MEncoder</application>: +</para> +<step><para> + <screen>cvs -z3 -d:pserver:anonymous@cvs.xvid.org:/xvid login</screen> +</para></step> +<step><para> + <screen>cvs -z3 -d:pserver:anonymous@cvs.xvid.org:/xvid co xvidcore</screen> +</para></step> +<step><para> + <screen>cd xvidcore/build/generic</screen> +</para></step> +<step><para> + <screen>./bootstrap.sh && ./configure</screen> + You may have to add some options (examine the output of + <command>./configure --help</command>). +</para></step> +<step><para> + <screen>make && make install</screen> +</para></step> +<step><para> + Recompile <application>MPlayer</application>. +</para></step> +</procedure> +</sect2> + +<!-- ********** --> + +<sect2 id="codec-x264"> +<title><systemitem class="library">x264</systemitem></title> + +<para> +<ulink url="http://developers.videolan.org/x264.html"><systemitem class="library">x264</systemitem></ulink> +is a library for creating H.264 video. +<application>MPlayer</application> sources are updated whenever +an <systemitem class="library">x264</systemitem> API change +occurs, so it is always suggested to use +<application>MPlayer</application> from Subversion. +</para> + +<para> +If you have a GIT client installed, the latest x264 +sources can be gotten with this command: +<screen>git clone git://git.videolan.org/x264.git</screen> + +Then build and install in the standard way: +<screen>./configure && make && make install</screen> + +Now rerun <filename>./configure</filename> for +<application>MPlayer</application> to pick up +<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> + +<sect2 id="xmms"> +<title>XMMS</title> + +<para> +<application>MPlayer</application> can use <application>XMMS</application> input +plugins to play many file formats. There are plugins for SNES game tunes, SID +tunes (from Commodore 64), many Amiga formats, .xm, .it, VQF, Musepack, Bonk, +shorten and many others. You can find them at the +<ulink url="http://www.xmms.org/plugins.php?category=input">XMMS input plugin page</ulink>. +</para> + +<para> +For this feature you need to have <application>XMMS</application> and compile +<application>MPlayer</application> with +<filename>./configure --enable-xmms</filename>. +</para> +</sect2> + +</sect1> + + +<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + + <sect1 id="rtc"> <title>RTC</title>