Merge svn changes up to 27824

Conflicts:
	cfg-common-opts.h
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libvo/x11_common.h
	mplayer.c
	stream/cache2.c

9 files changed, 47 insertions, 830 deletions

diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml
index 909efa2ef9..ad873d4877 100644
--- a/DOCS/xml/en/codecs.xml
+++ b/DOCS/xml/en/codecs.xml
@@ -15,65 +15,7 @@ of our homepage.
 </para>
 
 <para>
-The most important ones above all:
-</para>
-
-<itemizedlist>
-<listitem><para>
-  <emphasis role="bold">MPEG-1</emphasis> (<emphasis role="bold">VCD</emphasis>) and
-  <emphasis role="bold">MPEG-2</emphasis> (<emphasis role="bold">DVD</emphasis>) video
-</para></listitem>
-<listitem><para>
-  native decoders for <emphasis role="bold">all DivX variants,
-  3ivX, Microsoft MPEG-4</emphasis> v1, v2 and other MPEG-4 variants
-</para></listitem>
-<listitem><para>
-  native decoder for <emphasis role="bold">Windows Media Video 7/8</emphasis>
-  (<emphasis role="bold">WMV1/WMV2</emphasis>), and Win32 DLL decoder
-  for <emphasis role="bold">Windows Media Video 9</emphasis>
-  (<emphasis role="bold">WMV3</emphasis>),
-  both used in <filename>.wmv</filename> files
-</para></listitem>
-<listitem><para>
-  native <emphasis role="bold">Sorenson 1 (SVQ1)</emphasis> decoder
-</para></listitem>
-<listitem><para>
-  native <emphasis role="bold">Sorenson 3 (SVQ3)</emphasis> decoder
-</para></listitem>
-<listitem><para>
-  <emphasis role="bold">3ivx</emphasis> v1, v2 decoder
-</para></listitem>
-<listitem><para>
-  Cinepak and <emphasis role="bold">Intel Indeo</emphasis> codecs
-  (3.1,3.2,4.1,5.0)
-</para></listitem>
-<listitem><para>
-  <emphasis role="bold">MJPEG</emphasis>, AVID, VCR2, ASV2 and other hardware
-  formats
-</para></listitem>
-<listitem><para>
-  VIVO 1.0, 2.0, I263 and other <emphasis role="bold">H.263(+)</emphasis>
-  variants
-</para></listitem>
-<listitem><para>
-  FLI/FLC
-</para></listitem>
-<listitem><para>
-  <emphasis role="bold">RealVideo 1.0 &amp; 2.0</emphasis> from
-  <systemitem class="library">libavcodec</systemitem>, and
-  <emphasis role="bold">RealVideo 3.0 &amp; 4.0</emphasis> codecs using
-  RealPlayer libraries
-</para></listitem>
-<listitem><para>
-  native decoder for HuffYUV
-</para></listitem>
-<listitem><para>
-  Various old simple RLE-like formats
-</para></listitem>
-</itemizedlist>
-
-<para>
-If you have a Win32 codec not listed here which is not supported yet,
+If you have a Win32 codec which is not supported yet,
 please read the <link linkend="codec-importing">codec importing HOWTO</link>
 and help us add support for it.
 </para>
@@ -116,22 +58,8 @@ Just run <filename>./configure</filename> and compile.
 
 <para>
 <ulink url="http://www.xvid.org">Xvid</ulink> is a free software MPEG-4 ASP
-compliant video codec, which features two pass encoding and full MPEG-4 ASP
-support, making it a lot more efficient than the well-known DivX codec.
-It yields very good video quality and good performance due to CPU
-optimizations for most modern processors.
-</para>
-
-<para>
-It began as a forked development of the OpenDivX codec.
-This happened when ProjectMayo changed OpenDivX to closed source
-DivX4, and the non-ProjectMayo people working on OpenDivX got angry,
-then started Xvid. So both projects have the same origin.
-</para>
-
-<para>
-Note that Xvid is not necessary to decode Xvid-encoded video.
-<systemitem class="library">libavcodec</systemitem> is used by
+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>
 
@@ -184,154 +112,27 @@ default as it offers better speed.
 <sect2 id="codec-x264">
 <title><systemitem class="library">x264</systemitem></title>
 
-<sect3 id="codec-x264-whatis">
-<title>What is <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 streams.
-It is not 100% complete, but supports most of H.264's features which impact
-quality.
-There are also many advanced features in the H.264 specification
-which have nothing to do with video quality per se; many of these
-are not yet implemented in <systemitem class="library">x264</systemitem>.
-</para>
-
-<itemizedlist>
-<title>Encoder features</title>
-  <listitem><para>CAVLC/CABAC</para></listitem>
-  <listitem><para>Multi-references</para></listitem>
-  <listitem><para>
-  Intra: all macroblock types (16x16, 8x8, and 4x4 with all predictions)
-  </para></listitem>
-  <listitem><para>
-  Inter P: all partitions (from 16x16 down to 4x4)
-  </para></listitem>
-  <listitem><para>
-  Inter B: partitions from 16x16 down to 8x8 (including SKIP/DIRECT)
-  </para></listitem>
-  <listitem><para>
-  Ratecontrol: constant quantizer, constant bitrate, single or multipass ABR,
-  optional VBV
-  </para></listitem>
-  <listitem><para>Scene cut detection</para></listitem>
-  <listitem><para>Adaptive B-frame placement</para></listitem>
-  <listitem><para>
-  B-frames as references / arbitrary frame order
-  </para></listitem>
-  <listitem><para>8x8 and 4x4 adaptive spatial transform</para></listitem>
-  <listitem><para>Lossless mode</para></listitem>
-  <listitem><para>Custom quantization matrices</para></listitem>
-  <listitem><para>Parallel encoding of multiple slices</para></listitem>
-  <listitem><para>Interlacing</para></listitem>
-</itemizedlist>
-</sect3>
-
-
-<sect3 id="codec-h264-whatis">
-<title>What is H.264?</title>
-
-<para>
-H.264 is one name for a new digital video codec jointly developed
-by the ITU and MPEG.
-It can also be correctly referred to by the cumbersome names of
-"ISO/IEC 14496-10" or "MPEG-4 Part 10".
-More frequently, it is referred to as "MPEG-4 AVC" or just "AVC".
-</para>
-
-<para>
-Whatever you call it, H.264 may be worth trying because it can typically match
-the quality of MPEG-4 ASP with 5%-30% less bitrate.
-Actual results will depend on both the source material and the encoder.
-The gains from using H.264 do not come for free: Decoding H.264
-streams seems to have steep CPU and memory requirements.
-For instance, on a 1733 MHz Athlon, a DVD-resolution 1500kbps H.264
-video requires around 35% CPU to decode.
-By comparison, decoding a DVD-resolution 1500kbps MPEG-4 ASP stream
-requires around 10% CPU.
-This means that decoding high-definition streams is almost out of
-the question for most users.
-It also means that even a decent DVD rip may sometimes stutter on
-processors slower than 2.0 GHz or so.
-</para>
-
-<para>
-At least with <systemitem class="library">x264</systemitem>,
-encoding requirements are not much worse than what you are used to
-with MPEG-4 ASP.
-For instance, on a 1733 MHz Athlon a typical DVD encode would run
-at 5-15fps.
-</para>
-
-<para>
-This document is not intended to explain the details of H.264,
-but if you are interested in a brief overview, you may want to read
-<ulink url="http://www.cdt.luth.se/~peppar/kurs/smd151/spie04-h264OverviewPaper.pdf">The H.264/AVC Advanced Video Coding Standard: Overview and Introduction to the Fidelity Range Extensions</ulink>.
-</para>
-</sect3>
-
-
-<sect3 id="codec-x264-playback">
-<title>How can I play H.264 videos with
-  <application>MPlayer</application>?</title>
-  
-<para>
-<application>MPlayer</application> uses
-<systemitem class="library">libavcodec</systemitem>'s H.264 decoder.
-<systemitem class="library">libavcodec</systemitem> has had at
-least minimally usable H.264 decoding since around July 2004,
-however major changes and improvements have been implemented since
-that time, both in terms of more functionality supported and in
-terms of improved CPU usage.
-Just to be certain, it is always a good idea to use a recent Subversion
-checkout.
-</para>
-
-<para>
-If you want a quick and easy way to know whether there have been
-recent changes to <systemitem class="library">libavcodec</systemitem>'s
-H.264 decoding, you might keep an eye on 
-<ulink url="http://svn.mplayerhq.hu/ffmpeg/trunk/libavcodec/h264.c?view=log">FFmpeg Subversion repository's web interface</ulink>.
-</para>
-</sect3>
-
-
-<sect3 id="codec-x264-encode">
-<title>How can I encode videos using <application>MEncoder</application>
-  and <systemitem class="library">x264</systemitem>?</title>
-
-<para>
-If you have the GIT client installed, the latest x264
-sources can be gotten with this command:
-<screen>git clone git://git.videolan.org/x264.git</screen>
+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 as well.
-Perhaps this situation will change when and if an
-<systemitem class="library">x264</systemitem> "release" occurs.
-Meanwhile, <systemitem class="library">x264</systemitem> should
-be considered a bit unstable, in the sense that its programming
-interface is subject to change.
+<application>MPlayer</application> from Subversion.
 </para>
 
 <para>
-<systemitem class="library">x264</systemitem> is built and
-installed in the standard way:
-<screen>./configure &amp;&amp; make &amp;&amp; sudo make install</screen>
-This installs libx264.a in /usr/local/lib and x264.h is placed in
-/usr/local/include.
-
-With the <systemitem class="library">x264</systemitem> library
-and header placed in the standard locations, building
-<application>MPlayer</application> with
-<systemitem class="library">x264</systemitem> support is easy.
-Just run the standard:
-<screen>./configure &amp;&amp; make &amp;&amp; sudo make install</screen>
-The <filename>./configure</filename> script will autodetect that you have
-satisfied the requirements for <systemitem class="library">x264</systemitem>.
+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 &amp;&amp; make &amp;&amp; make install</screen>
+
+Now rerun <filename>./configure</filename> for
+<application>MPlayer</application> to pick up
+<systemitem class="library">x264</systemitem> support.
 </para>
-</sect3>
 </sect2>
 </sect1>
 
@@ -342,55 +143,6 @@ satisfied the requirements for <systemitem class="library">x264</systemitem>.
 <sect1 id="audio-codecs">
 <title>Audio codecs</title>
 
-<itemizedlist>
-<title>The most important audio codecs above all:</title>
-<listitem><para>
-  MPEG layer 1/2/3 (MP1/2/3) audio (<emphasis role="bold">native</emphasis>
-  code, with MMX/SSE/3DNow! optimization)
-</para></listitem>
-<listitem><para>
-  Windows Media Audio 7 and 8 (AKA WMAv1 and WMAv2)
-  (<emphasis role="bold">native</emphasis> code, with
-  <link linkend="ffmpeg"><systemitem class="library">libavcodec</systemitem></link>)
-</para></listitem>
-<listitem><para>
-  Windows Media Audio 9 (WMAv3) (using DMO DLL)
-</para></listitem>
-<listitem><para>
-  AC-3 Dolby audio (<emphasis role="bold">native</emphasis> code, with
-  MMX/SSE/3DNow! optimization)
-</para></listitem>
-<listitem><para>
-  AC-3 passing through sound card hardware
-</para></listitem>
-<listitem><para>
-  AAC
-</para></listitem>
-<listitem><para>
-  Ogg Vorbis audio codec (<emphasis role="bold">native</emphasis> library)
-</para></listitem>
-<listitem><para>
-  RealAudio: DNET (low bitrate AC-3), Cook, Sipro and ATRAC3
-</para></listitem>
-<listitem><para>
-  QuickTime: Qualcomm and QDesign audio codecs
-</para></listitem>
-<listitem><para>
-  VIVO audio (g723, Vivo Siren)
-</para></listitem>
-<listitem><para>
-  Voxware audio (using DirectShow DLL)
-</para></listitem>
-<listitem><para>
-  alaw and ulaw, various GSM, ADPCM and PCM formats and other simple old
-  audio codecs
-</para></listitem>
-<listitem><para>
-  Adaptive Multi-Rate (AMR) speech codecs
-</para></listitem>
-</itemizedlist>
-
-<!-- ********** -->
 
 <sect2 id="swac3">
 <title>Software AC-3 decoding</title>
@@ -490,21 +242,23 @@ only white noise).
 <title>AAC codec</title>
 
 <para>
-AAC (Advanced Audio Coding) is an audio codec sometimes found in MOV and MP4
-files. An open source decoder called FAAD is available from
-<ulink url="http://www.audiocoding.com"/>.
-<application>MPlayer</application> includes a CVS snapshot of libfaad 2.1
-beta, so you do not need to get it separately.
+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>
-If you use gcc 3.2 which fails to compile our internal FAAD or want to use
-the external library for some other reason, download the library from the
-<ulink url="http://www.audiocoding.com/modules/mydownloads/">download page</ulink>
-and pass <option>--enable-faad-external</option>
-to <filename>./configure</filename>.
-You do not need all of faad2 to decode AAC files, libfaad is enough. Build
-it like this:
+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
@@ -513,11 +267,6 @@ cd libfaad
 make
 make install
 </screen>
-Binaries are not available from audiocoding.com, but you can (apt-)get Debian
-packages from
-<ulink url="http://www.debian-multimedia.org/">Christian Marillat's homepage</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>
 </sect2>
 
diff --git a/DOCS/xml/en/containers.xml b/DOCS/xml/en/containers.xml
deleted file mode 100644
index f3d4c6d124..0000000000
--- a/DOCS/xml/en/containers.xml
+++ /dev/null
@@ -1,520 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter id="containers">
-<title>Containers</title>
-
-<para>
-It is important to clarify a common mistake. When people see a file with a
-<filename>.AVI</filename> extension, they immediately conclude that it is
-not an MPEG file.  That is not true. At least not entirely. Contrary to
-popular belief such a file <emphasis>can</emphasis> contain MPEG-1 video.
-</para>
-
-<para>
-You see, a <emphasis role="bold">codec</emphasis> is not the same as a
-<emphasis role="bold">container format</emphasis>.
-Examples of video <emphasis role="bold">codecs</emphasis> are: MPEG-1, MPEG-2,
-MPEG-4 (DivX), Indeo5, 3ivx.
-Examples of container <emphasis role="bold">formats</emphasis> are:
-MPG, AVI, ASF.
-</para>
-
-<para>
-In theory, you can put an OpenDivX video and MP3 audio
-into an <emphasis role="bold">MPG container</emphasis>. However, most
-players will not play it, since they expect MPEG-1 video and MP2 audio (unlike
-<emphasis role="bold">AVI</emphasis>, <emphasis role="bold">MPG</emphasis>
-does not have the necessary fields to describe its video and audio streams).
-Or you might put MPEG-1 video into an AVI file.
-<ulink url="http://ffmpeg.org/">FFmpeg</ulink> and
-<link linkend="mencoder"><application>MEncoder</application></link>
-can create these files.
-</para>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-
-<sect1 id="video-formats">
-<title>Video formats</title>
-
-<sect2 id="mpg-vob-dat">
-<title>MPEG files</title>
-
-<para>
-MPEG files come in different guises:
-</para>
-
-<itemizedlist>
-<listitem><para>
-  MPG: This is the most <emphasis role="bold">basic</emphasis> form of the
-  MPEG file formats. It contains MPEG-1 video, and MP2 (MPEG-1 layer 2) or
-  rarely MP1 audio.
-</para></listitem>
-<listitem><para>
-  DAT: This is the very same format as MPG with a different extension. It
-  is used on <emphasis role="bold">Video CDs</emphasis>. Due to the way VCDs
-  are created and Linux is designed, the DAT files cannot be played nor copied
-  from VCDs as regular files. You have to use <option>vcd://</option>
-  to play a Video CD.
-</para></listitem>
-<listitem><para>
-  VOB: This is the MPEG file format on <emphasis role="bold">DVDs</emphasis>.
-  It is the same as MPG, plus the capability to contain subtitles or non-MPEG
-  (AC-3) audio. It contains encoded MPEG-2 video and usually AC-3 audio, but DTS,
-  MP2 and uncompressed LPCM are allowed, too. <emphasis role="bold">Read the
-  <link linkend="dvd">DVD</link> section</emphasis>!
-</para></listitem>
-<listitem><para>
-  TY: This is a TiVo MPEG stream. It contains MPEG PES data for audio and
-  video streams, as well as extra information like closed captions. The
-  container is not an MPEG program stream, but a closed format created by
-  TiVo. For more information on TiVo stream format, please refer to
-  <ulink url="http://dvd-create.sourceforge.net/tystudio/tystream.shtml">
-  the TyStudio page</ulink>.
-</para></listitem>
-</itemizedlist>
-
-<para>
-Series of frames form independent groups in MPEG files. This means that you
-can cut/join an MPEG file with standard file tools (like
-<command>dd</command>, <command>cut</command>), and it remains completely
-functional.
-</para>
-
-<para>
-One important feature of MPEG files is that they have a field to describe the
-aspect ratio of the video stream within. For example SVCDs have 480x480
-resolution video, and in the header that field is set to 4:3, so that it is
-played at 640x480. AVI files often lack this field, so they have to be
-rescaled during encoding or played with the <option>-aspect</option>
-option.
-</para>
-</sect2>
-
-<!-- ********** -->
-
-<sect2 id="avi">
-<title>AVI files</title>
-
-<para>
-Designed by Microsoft,
-<emphasis role="bold">AVI (Audio Video Interleaved)</emphasis>
-is a widespread multipurpose format currently used mostly for MPEG-4 (DivX and
-DivX4) video. It has many known drawbacks and shortcomings (for example in
-streaming).
-It supports one video stream and 0 to 99 audio streams and can be as big as
-2GB, but there exists an extension allowing bigger files called
-<emphasis role="bold">OpenDML</emphasis>. Microsoft currently strongly
-discourages its use and encourages ASF/WMV. Not that anybody cares.
-</para>
-
-<para>
-There is a hack that allows AVI files to contain an Ogg Vorbis audio
-stream, but makes them incompatible with standard AVI.
-<application>MPlayer</application> supports playing these files. Seeking is
-also implemented but severely hampered by badly encoded files with
-confusing headers. Unfortunately the only encoder currently capable of
-creating these files, <application>NanDub</application>, has this problem.
-</para>
-
-<note><para>
-DV cameras create raw DV streams that DV grabbing utilities convert to two
-different types of AVI files. The AVI will then contain either separate
-audio and video streams that <application>MPlayer</application> can play or
-the raw DV stream for which support is under development.
-</para></note>
-
-<para>
-There are two kinds of AVI files:
-<itemizedlist>
-<listitem><para>
-  <emphasis role="bold">Interleaved:</emphasis> Audio and video content is
-  interleaved. This is the standard usage. Recommended and mostly used. Some
-  tools create interleaved AVIs with bad sync.
-  <application>MPlayer</application> detects these as interleaved, and this
-  climaxes in loss of A/V sync, probably at seeking.
-  These files should be played as non-interleaved
-  (with the <option>-ni</option> option).
-</para></listitem>
-<listitem><para>
-  <emphasis role="bold">Non-interleaved:</emphasis> First comes the whole
-  video stream, then the whole audio stream. It thus needs a lot of seeking,
-  making playing from network or CD-ROM difficult.
-</para></listitem>
-</itemizedlist>
-</para>
-
-<para>
-<application>MPlayer</application> supports two kinds of timings for AVI
-files:
-<itemizedlist>
-<listitem><para>
-  <emphasis role="bold">bps-based:</emphasis> It is based on the
-  bitrate/samplerate of the video/audio stream. This method is used by
-  most players, including <ulink url="http://avifile.sf.net">avifile</ulink>
-  and <application>Windows Media Player</application>. Files with broken
-  headers, and files created with VBR audio but not VBR-compliant encoder
-  will result in A/V desync with this method (mostly at seeking).
-</para></listitem>
-<listitem><para>
-  <emphasis role="bold">interleaving-based:</emphasis> It does not use the
-  bitrate value of the header, instead it uses the relative position of
-  interleaved audio and video chunks,
-  making badly encoded files with VBR audio playable.
-</para></listitem>
-</itemizedlist>
-</para>
-
-<para>
-Any audio and video codec is allowed, but note that VBR audio is not well
-supported by most players. The file format makes it possible to use VBR
-audio, but most players expect CBR audio, thus they fail with VBR. VBR is
-uncommon and Microsoft's AVI specs only describe CBR audio. I also noticed
-that most AVI encoders/multiplexers create bad files when using VBR audio.
-There are only two known exceptions: <application>NanDub</application> and
-<link linkend="mencoder"><application>MEncoder</application></link>.
-</para>
-</sect2>
-
-<!-- ********** -->
-
-<sect2 id="asf-wmv">
-<title>ASF/WMV files</title>
-
-<para>
-ASF (Active Streaming Format) comes from Microsoft. They developed two
-variants of ASF, v1.0 and v2.0. v1.0 is used by their media tools
-(<application>Windows Media Player</application> and
-<application>Windows Media Encoder</application>)
-and is very secret. v2.0 is published and patented :). Of course they differ,
-there is no compatibility at all (it is just another legal game).
-<application>MPlayer</application> supports only v1.0, as nobody has ever seen
-v2.0 files :). Note that ASF files nowadays come with the extension
-<filename>.WMA</filename> or <filename>.WMV</filename>.
-</para>
-</sect2>
-
-<!-- ********** -->
-
-<sect2 id="mov">
-<title>QuickTime/MOV files</title>
-
-<para>
-These formats were designed by Apple and can contain any codec, CBR or VBR.
-They usually have a <filename>.QT</filename> or <filename>.MOV</filename>
-extension. Note that since the MPEG-4 group chose QuickTime as the recommended
-file format for MPEG-4, their MOV files come with a <filename>.MPG</filename> or
-<filename>.MP4</filename> extension (Interestingly the video and audio
-streams in these files are real MPG and AAC files. You can even extract them
-with the <option>-dumpvideo</option> and <option>-dumpaudio</option> options.).
-</para>
-</sect2>
-
-<!-- ********** -->
-
-<sect2 id="vivo">
-<title>VIVO files</title>
-
-<para>
-<application>MPlayer</application> happily demuxes VIVO file formats. The
-biggest disadvantage of the format is that it has no index block, nor a
-fixed packet size or sync bytes and most files lack even keyframes, so
-forget seeking!
-</para>
-
-<para>
-The video codec of VIVO/1.0 files is standard
-<emphasis role="bold">h.263</emphasis>.
-The video codec of VIVO/2.0 files is a modified, nonstandard
-<emphasis role="bold">h.263v2</emphasis>. The audio is the same, it may be
-<emphasis role="bold">g.723 (standard)</emphasis>, or
-<emphasis role="bold">Vivo Siren</emphasis>.
-</para>
-</sect2>
-
-<!-- ********** -->
-
-<sect2 id="fli">
-<title>FLI files</title>
-
-<para>
-<emphasis role="bold">FLI</emphasis> is a very old file format used by
-Autodesk Animator, but it is a common file format for short animations on the
-net.
-<application>MPlayer</application> demuxes and decodes FLI movies and is
-even able to seek within them (useful when looping with the
-<option>-loop</option> option). FLI files do not have keyframes, so the
-picture will be messy for a short time after seeking.
-</para>
-</sect2>
-
-<!-- ********** -->
-
-<sect2 id="realmedia">
-<title>RealMedia (RM) files</title>
-
-<para>
-Yes, <application>MPlayer</application> can read (demux) RealMedia
-(<filename>.rm</filename>) files.
-</para>
-</sect2>
-
-<!-- ********** -->
-
-<sect2 id="nuppelvideo">
-<title>NuppelVideo files</title>
-
-<para>
-NuppelVideo
-is a TV grabber tool (AFAIK:). <application>MPlayer</application> can read
-its <filename>.NUV</filename> files (only NuppelVideo 5.0). Those files can
-contain uncompressed YV12, YV12+RTJpeg compressed, YV12 RTJpeg+lzo
-compressed, and YV12+lzo compressed frames.
-<application>MPlayer</application> decodes (and also
-<emphasis role="bold">encodes</emphasis>
-them with <application>MEncoder</application> to MPEG-4 (DivX)/etc!) them all.
-Seeking works.
-</para>
-</sect2>
-
-<!-- ********** -->
-
-<sect2 id="yuv4mpeg">
-<title>yuv4mpeg files</title>
-
-<para>
-<ulink url="http://mjpeg.sf.net">yuv4mpeg / yuv4mpeg2</ulink>
-is a file format used by the
-<ulink url="http://mjpeg.sf.net">mjpegtools programs</ulink>.
-You can grab, produce, filter or encode video in this format using these tools.
-The file format is really a sequence of uncompressed YUV 4:2:0 images.
-</para>
-</sect2>
-
-<!-- ********** -->
-
-<sect2 id="film">
-<title>FILM files</title>
-
-<para>
-This format is used on old Sega Saturn CD-ROM games.
-</para>
-</sect2>
-
-<!-- ********** -->
-
-<sect2 id="roq">
-<title>RoQ files</title>
-
-<para>
-RoQ files are multimedia files used in some ID games such as Quake III and
-Return to Castle Wolfenstein.
-</para>
-</sect2>
-
-<!-- ********** -->
-
-<sect2 id="ogg">
-<title>OGG/OGM files</title>
-
-<para>
-This is a new file format from the
-<ulink url="http://www.xiph.org">Xiph.Org Foundation</ulink>.
-It can contain any video or audio codec, CBR or VBR. You'll need
-<systemitem class="library">libogg</systemitem> and
-<systemitem class="library">libvorbis</systemitem> installed before
-compiling <application>MPlayer</application> to be able to play it.
-</para>
-</sect2>
-
-<!-- ********** -->
-
-<sect2 id="sdp">
-<title>SDP files</title>
-
-<para>
-<ulink url="ftp://ftp.rfc-editor.org/in-notes/rfc2327.txt">SDP</ulink> is an
-IETF standard format for describing video and/or audio RTP streams.
-(The "<ulink url="http://www.live555.com/mplayer/">LIVE555 Streaming Media</ulink>"
-are required.)
-</para>
-</sect2>
-
-<!-- ********** -->
-
-<sect2 id="pva">
-<title>PVA files</title>
-
-<para>
-PVA is an MPEG-like format used by DVB TV boards' software (e.g.:
-<application>MultiDec</application>,
-<application>WinTV</application> under Windows).
-</para>
-</sect2>
-
-<!-- ********** -->
-
-<sect2 id="nsv">
-<title>NSV files</title>
-
-<para>
-NSV (NullSoft Video) is the file format used by the
-<application>Winamp</application> player to stream audio and video.
-Video is VP3, VP5 or VP6, audio is MP3, AAC or VLB.
-The audio only version of NSV has the <filename>.nsa</filename> extension.
-<application>MPlayer</application> can play both NSV streams and files.
-Please note that most files from the
-<ulink url="http://www.winamp.com">Winamp site</ulink> use VLB audio, that
-can't be decoded yet. Moreover streams from that site need an extra
-depacketization layer that still has to be implemented (those files are
-unplayable anyway because they use VLB audio).
-</para>
-</sect2>
-
-<!-- ********** -->
-
-<sect2 id="matroska">
-<title>Matroska files</title>
-
-<para>
-Matroska is an open container format.
-Read more on the <ulink url="http://www.matroska.org/">official site</ulink>.
-</para>
-</sect2>
-
-<!-- ********** -->
-
-<sect2 id="nut">
-<title>NUT files</title>
-
-<para>
-NUT is the container format developed by <application>MPlayer</application> and
-<application>FFmpeg</application> folks. Both projects support it.
-Read more on the <ulink url="http://www.nut-container.org/">official
-site</ulink>.
-</para>
-</sect2>
-
-<!-- ********** -->
-
-<sect2 id="gif">
-<title>GIF files</title>
-
-<para>
-The <emphasis role="bold">GIF</emphasis> format is a common format for web
-graphics. There are two versions of the GIF spec, GIF87a and GIF89a.
-The main difference is that GIF89a allows for animation.
-<application>MPlayer</application> supports both formats through use of
-<systemitem class="library">libungif</systemitem> or
-another libgif-compatible library. Non-animated GIFs will be displayed as
-single frame videos. (Use the <option>-loop</option> and
-<option>-fixed-vo</option> options to display these longer.)
-</para>
-
-<para>
-<application>MPlayer</application> currently does not support seeking in GIF
-files. GIF files do not necessarily have a fixed frame size, nor a fixed
-framerate. Rather, each frame is of independent size and is supposed to be
-positioned in a certain place on a field of fixed-size. The framerate is
-controlled by an optional block before each frame that specifies the next
-frame's delay in centiseconds.
-</para>
-
-<para>
-Standard GIF files contain 24-bit RGB frames with at most an 8-bit indexed
-palette. These frames are usually LZW-compressed, although some GIF encoders
-produce uncompressed frames to avoid patent issues with LZW compression.
-</para>
-
-<para>
-If your distribution does not come with
-<systemitem class="library">libungif</systemitem>, download a copy from the
-<ulink url="http://sourceforge.net/projects/libungif">libungif
-homepage</ulink>. For detailed technical information, have a look at the
-<ulink url="http://www.w3.org/Graphics/GIF/spec-gif89a.txt">GIF89a specification</ulink>.
-</para>
-</sect2>
-</sect1>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-
-<sect1 id="audio-formats">
-<title>Audio formats</title>
-
-<para>
-<application>MPlayer</application> is a <emphasis role="bold">movie</emphasis>
-and not a <emphasis role="bold">media</emphasis> player, although it can play
-some audio file formats (they are listed in the sections below).  This is not
-a recommended usage of <application>MPlayer</application>, you better use <ulink
-url="http://www.xmms.org">XMMS</ulink>.
-</para>
-
-<!-- ********** -->
-
-<sect2 id="mp3">
-<title>MP3 files<