# HG changeset patch
# User diego
# Date 1225357594 0
# Node ID 6b0e98eb48e954699d28ba29b29ea0de6dffcd78
# Parent b2c20ca5becb665e06f8d335b85c0fd7ef77a719
Move codec installation instructions from the codecs section to a more
sensible place in the installation section.
diff -r b2c20ca5becb -r 6b0e98eb48e9 DOCS/xml/en/codecs.xml
--- a/DOCS/xml/en/codecs.xml Thu Oct 30 08:55:36 2008 +0000
+++ b/DOCS/xml/en/codecs.xml Thu Oct 30 09:06:34 2008 +0000
@@ -17,154 +17,6 @@
and help us add support for it.
-
-Codec installation
-
-
-
-
-Xvid
-
-
-Xvid is a free software MPEG-4 ASP
-compliant video codec. Note that Xvid is not necessary to decode Xvid-encoded
-video. libavcodec is used by
-default as it offers better speed.
-
-
-
-Installing Xvid
-
- Like most open source software, it is available in two flavors:
- official releases
- 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 Xvid
- CVS work with MEncoder:
-
-
- cvs -z3 -d:pserver:anonymous@cvs.xvid.org:/xvid login
-
-
- cvs -z3 -d:pserver:anonymous@cvs.xvid.org:/xvid co xvidcore
-
-
- cd xvidcore/build/generic
-
-
- ./bootstrap.sh && ./configure
- You may have to add some options (examine the output of
- ./configure --help).
-
-
- make && make install
-
-
- Recompile MPlayer.
-
-
-
-
-
-
-
-x264
-
-
-x264
-is a library for creating H.264 video.
-MPlayer sources are updated whenever
-an x264 API change
-occurs, so it is always suggested to use
-MPlayer from Subversion.
-
-
-
-If you have a GIT client installed, the latest x264
-sources can be gotten with this command:
-git clone git://git.videolan.org/x264.git
-
-Then build and install in the standard way:
-./configure && make && make install
-
-Now rerun ./configure for
-MPlayer to pick up
-x264 support.
-
-
-
-
-
-
-AAC
-
-
-An open source AAC decoder called FAAD2 is available from
-.
-MPlayer includes a copy of it in its source tree.
-If you want to use the external library instead, install it and pass
- to ./configure.
-
-
-
-FAAD2 binaries are not available from audiocoding.com, but you can (apt-)get
-Debian packages from
-Christian Marillat,
-Mandrake/Mandriva RPMs from the P.L.F
-and Fedora RPMs from Livna.
-
-
-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:
-
-cd faad2/
-sh bootstrap
-./configure
-cd libfaad
-make
-make install
-
-
-
-
-
-
-
-AMR
-
-
-Adaptive Multi-Rate speech codec is used in third generation (3G) mobile
-phones.
-Reference implementation is available from
-The 3rd Generation Partnership Project
-(free for private use).
-To enable support, download and install support libraries for
-AMR-NB and AMR-WB
-following the instructions on that page. Recompile MPlayer afterwards.
-
-
-
-
-XMMS
-
-
-MPlayer can use XMMS 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
-XMMS input plugin page.
-
-
-
-For this feature you need to have XMMS and compile
-MPlayer with
-./configure --enable-xmms.
-
-
-
-
-
diff -r b2c20ca5becb -r 6b0e98eb48e9 DOCS/xml/en/install.xml
--- a/DOCS/xml/en/install.xml Thu Oct 30 08:55:36 2008 +0000
+++ b/DOCS/xml/en/install.xml Thu Oct 30 09:06:34 2008 +0000
@@ -347,6 +347,158 @@
+
+Codec installation
+
+
+
+
+Xvid
+
+
+Xvid is a free software MPEG-4 ASP
+compliant video codec. Note that Xvid is not necessary to decode Xvid-encoded
+video. libavcodec is used by
+default as it offers better speed.
+
+
+
+Installing Xvid
+
+ Like most open source software, it is available in two flavors:
+ official releases
+ 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 Xvid
+ CVS work with MEncoder:
+
+
+ cvs -z3 -d:pserver:anonymous@cvs.xvid.org:/xvid login
+
+
+ cvs -z3 -d:pserver:anonymous@cvs.xvid.org:/xvid co xvidcore
+
+
+ cd xvidcore/build/generic
+
+
+ ./bootstrap.sh && ./configure
+ You may have to add some options (examine the output of
+ ./configure --help).
+
+
+ make && make install
+
+
+ Recompile MPlayer.
+
+
+
+
+
+
+
+x264
+
+
+x264
+is a library for creating H.264 video.
+MPlayer sources are updated whenever
+an x264 API change
+occurs, so it is always suggested to use
+MPlayer from Subversion.
+
+
+
+If you have a GIT client installed, the latest x264
+sources can be gotten with this command:
+git clone git://git.videolan.org/x264.git
+
+Then build and install in the standard way:
+./configure && make && make install
+
+Now rerun ./configure for
+MPlayer to pick up
+x264 support.
+
+
+
+
+
+
+AAC
+
+
+An open source AAC decoder called FAAD2 is available from
+.
+MPlayer includes a copy of it in its source tree.
+If you want to use the external library instead, install it and pass
+ to ./configure.
+
+
+
+FAAD2 binaries are not available from audiocoding.com, but you can (apt-)get
+Debian packages from
+Christian Marillat,
+Mandrake/Mandriva RPMs from the P.L.F
+and Fedora RPMs from Livna.
+
+
+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:
+
+cd faad2/
+sh bootstrap
+./configure
+cd libfaad
+make
+make install
+
+
+
+
+
+
+
+AMR
+
+
+Adaptive Multi-Rate speech codec is used in third generation (3G) mobile
+phones.
+Reference implementation is available from
+The 3rd Generation Partnership Project
+(free for private use).
+To enable support, download and install support libraries for
+AMR-NB and AMR-WB
+following the instructions on that page. Recompile MPlayer afterwards.
+
+
+
+
+XMMS
+
+
+MPlayer can use XMMS 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
+XMMS input plugin page.
+
+
+
+For this feature you need to have XMMS and compile
+MPlayer with
+./configure --enable-xmms.
+
+
+
+
+
+
+
+
+
RTC