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

13 files changed, 150 insertions, 878 deletions

diff --git a/DOCS/man/de/mplayer.1 b/DOCS/man/de/mplayer.1
index 1533deb383..14b21feecc 100644
--- a/DOCS/man/de/mplayer.1
+++ b/DOCS/man/de/mplayer.1
@@ -3,7 +3,7 @@
 .\" Tobias Diedrich gepflegt.
 .\" Encoding: iso-8859-1
 .\"
-.\" In sync with r27182
+.\" In sync with r27384
 .
 .\" --------------------------------------------------------------------------
 .\" Makrodefinitionen
@@ -64,7 +64,7 @@ mencoder \- Movie Encoder
 .
 .br
 .B mplayer
-[dvd|dvdnav]://[Titel|[Starttitel]\-Endtitel]
+[dvd|dvdnav]://[Titel|[Starttitel]\-Endtitel][/Gerät]
 [Optionen]
 .
 .br
@@ -976,7 +976,7 @@ identify=6.
 Zum Beispiel listet es für eine DVD die Kapitel die zeitliche Länge jedes
 Titels sowie die Disc-ID.
 Kombiniere dies mit \-frames 0, um alle Ausgaben zu unterdrücken.
-Das Wrapper-Script TOOLS/\:midentify.sh unterdrückt die anderen Ausgaben von
+Das Wrapper-Script TOOLS/\:midentify unterdrückt die anderen Ausgaben von
 MPlayer
 und führt (hoffentlich) Shell-Escaping für die Dateinamen aus.
 .
@@ -1098,6 +1098,10 @@ gesendet werden (momentan werden nur die Derivate von X11 unterstützt).
 Nötig, um in DVD-Menüs Schaltflächen auszuwählen.
 .
 .TP
+.B \-noar
+Schaltet Unterstützung für Apple-Infrarotfernbedienung ab.
+.
+.TP
 .B \-noconsolecontrols
 Für Ereignisse wird von MPlayer nicht die Standardeingabe (stdin) verwendet.
 Das ist nützlich beim Lesen von Daten von der Standardeingabe.
@@ -1117,10 +1121,6 @@ Schaltet die Joystickunterstützung aus.
 Schaltet Unterstützung für LIRC aus.
 .
 .TP
-.B \-noar
-Schaltet Unterstützung für Apple-Infrarotfernbedienung ab.
-.
-.TP
 .B \-nomouseinput
 Sperrt die Eingabe mittels Mausbuttons (Buttonpress/\:-release) (diese Option
 wird unter anderem von mozplayerxp verwendet, um ein eigenes Kontextmenü
@@ -3028,7 +3028,6 @@ Wird nur von fbdev-, dga2-, svga- und vesa-Videoausgabetreibern unterstützt.
 Spiele den Film mit Fensterrand und Dekoration.
 Da dies standardmäßig an ist, benutze \-noborder um die normale
 Fensterdekoration abzuschalten.
-Wird vom directx-Videoausgabetreiber unterstützt.
 .
 .TP
 .B \-brightness <\-100\-100>
@@ -3394,7 +3393,7 @@ beispielsweise nützlich ist, um MPlayer in einen Browser einzubetten (z.B.\&
 mit der plugger-Erweiterung).
 .
 .TP
-.B \-xineramascreen <\-2\-...> (nur bei X11)
+.B \-xineramascreen <\-2\-...>
 Bei Xinerama-Konfigurationen (z.B.\& bei einem einzigen Desktop, der sich
 über mehrere Monitore erstreckt) gibt diese Option an, auf welchem Schirm
 das Video angezeigt werden soll.
@@ -3405,6 +3404,10 @@ Die mit der Option \-geometry gesetzte Initialposition ist relativ zum
 angegebenen Bildschirm.
 Wird normalerweise nur mit "\-fstype \-fullscreen" oder "\-fstype none"
 funktionieren.
+Diese Option ist nicht geeignet, nur das Startbild zu setzen (und nicht auch
+das Bild im Vollbildmodus), \-geometry ist für diesen Zweck momentan die beste
+zur Verfügung stehende Option.
+Unterstützt von den Videoausgabetreibern gl, gl2, x11 und xv.
 .
 .TP
 .B \-zrbw (nur bei \-vo zr)
@@ -11028,6 +11031,10 @@ momentan nur für MPEG[12] von Bedeutung.
 Manchmal ist es nötig, diese zu erhöhen, um "Buffer Underflows" zu verweiden.
 .
 .TP
+.B "o\ \ \ \ \ \ "
+FIXME: Dokumentiere diese Option.
+.
+.TP
 .B packetsize=<Größe>
 Größe, ausgedrückt in Bytes, des einheitlichen Pakets für das gewählte Format.
 Beim Muxing zu MPEG[12]-Implementierungen sind die Standardwerte 2324 für
@@ -11041,9 +11048,6 @@ Decodierungszeitstempels (DTS) für jeden vorhandenen Stream
 (Verzögerung von Demuxing zu Decodierung).
 .
 .TP
-.B "o\ \ \ \ \ \ "
-FIXME: Dokumentiere diese Option.
-.
 .
 .
 .\" --------------------------------------------------------------------------
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index a169cbe613..bd1f196ced 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -3080,7 +3080,7 @@ than the screen.
 .br
 .I NOTE:
 This option is only supported by the x11, xmga, xv, xvmc, xvidix,
-gl, gl2, directx and tdfxfb video output drivers.
+gl, gl2, directx, fbdev and tdfxfb video output drivers.
 .sp 1
 .I EXAMPLE:
 .PD 0
@@ -3206,12 +3206,12 @@ Not supported by all video output drivers.
 .
 .TP
 .B \-screenh <pixels>
-Specify the vertical screen resolution for video output drivers which
+Specify the screen height for video output drivers which
 do not know the screen resolution like fbdev, x11 and TV-out.
 .
 .TP
 .B \-screenw <pixels>
-Specify the horizontal screen resolution for video output drivers which
+Specify the screen width for video output drivers which
 do not know the screen resolution like fbdev, x11 and TV-out.
 .
 .TP
@@ -9093,7 +9093,6 @@ FIXME: Document this.
 FIXME: Document this.
 .
 .
-.
 .SS nuv (\-nuvopts)
 .
 Nuppel video is based on RTJPEG and LZO.
@@ -10043,7 +10042,7 @@ exhaustive search (very slow, and no better than umh)
 radius of exhaustive or multi-hexagon motion search (default: 16)
 .
 .TP
-.B subq=<1\-7>
+.B subq=<1\-9>
 Adjust subpel refinement quality.
 This parameter controls quality versus speed tradeoffs involved in the motion
 estimation decision process.
@@ -10068,12 +10067,18 @@ Then selects the best type.
 Then finishes the quarterpixel refinement for that type.
 .IPs 5
 Runs best quality quarterpixel precision motion estimation on all
-candidate macroblock types, before selecting the best type (default).
+candidate macroblock types, before selecting the best type.
+Also refines the two motion vectors used in bidirectional macroblocks,
+rather than reusing vectors from the forward and backward searches.
 .IPs 6
 Enables rate-distortion optimization of macroblock types in
-I- and P-frames.
+I- and P-frames (default).
 .IPs 7
-Enables rate-distortion optimization of motion vectors and intra modes. (best)
+Enables rate-distortion optimization of macroblock types in all frames.
+.IPs 8
+Enables rate-distortion optimization of motion vectors and intra prediction modes in I- and P-frames.
+.IPs 9
+Enables rate-distortion optimization of motion vectors and intra prediction modes in all frames (best).
 .RE
 .PD 1
 .RS
@@ -10095,18 +10100,7 @@ Without this option, a whole macroblock must use the same reference.
 Requires frameref>1.
 .
 .TP
-.B (no)brdo
-Enables rate-distortion optimization of macroblock types in B-frames.
-Requires subq>=6.
-.
-.TP
-.B (no)bime
-Refine the two motion vectors used in bidirectional macroblocks,
-rather than re-using vectors from the forward and backward searches.
-This option has no effect without B-frames.
-.
-.TP
-.B trellis=<0\-2>
+.B trellis=<0\-2> (cabac only)
 rate-distortion optimal quantization
 .PD 0
 .RSs
@@ -10120,6 +10114,19 @@ enabled during all mode decisions (slow, requires subq>=6)
 .PD 1
 .
 .TP
+.B psy-rd=rd[:trell]
+Sets the strength of the psychovisual optimization.
+.PD 0
+.RSs
+.IPs rd=<0.0\-10.0>
+psy optimization strength (requires subq>=6) (default: 1.0)
+.IPs trell=<0.0\-10.0>
+trellis (requires trellis, experimental) (default: 0.0)
+.RE
+.PD 1
+.
+.
+.TP
 .B deadzone_inter=<0\-32>
 Set the size of the inter luma quantization deadzone for non-trellis
 quantization (default: 21).
@@ -10515,7 +10522,6 @@ Encryption key the demuxer should use.
 This is the raw binary data of the key converted to a hexadecimal string.
 .
 .
-.
 .SS FFmpeg libavformat muxers (\-lavfopts) (also see \-of lavf)
 .
 .TP
diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1
index eacff95201..22549f410f 100644
--- a/DOCS/man/fr/mplayer.1
+++ b/DOCS/man/fr/mplayer.1
@@ -1,4 +1,4 @@
-.\" synced with r27651
+.\" synced with r27691
 .\" Encoding: iso-8859-1
 .\" MPlayer (C) 2000-2008 MPlayer Team
 .\" The English man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann
@@ -3241,7 +3241,7 @@ fenętre au lieu celui de l'écran.
 .br
 .I NOTE:
 Cette option n'est permise que par les pilotes de sortie vidéo x11, xmga, xv,
-xvmc, xvidix, gl, gl2, directx et tdfxfb.
+xvmc, xvidix, gl, gl2, directx, fbdev et tdfxfb.
 .sp 1
 .I EXEMPLE:
 .PD 0
diff --git a/DOCS/man/hu/mplayer.1 b/DOCS/man/hu/mplayer.1
index 7ede56e5c8..97d8661750 100644
--- a/DOCS/man/hu/mplayer.1
+++ b/DOCS/man/hu/mplayer.1
@@ -1,4 +1,4 @@
-.\" Synced with r27607
+.\" Synced with r27691
 .\" MPlayer (C) 2000-2008 MPlayer Team
 .\" Ezt a man oldalt Gabucino, Diego Biurrun és Jonas Jermann készíti/készítette
 .\" Karbantartó: Gabrov
@@ -33,7 +33,7 @@
 .\" Név
 .\" --------------------------------------------------------------------------
 .
-.TH MPlayer 1 "2008. 09. 14." "MPlayer Project" "A film lejátszó"
+.TH MPlayer 1 "2008. 10. 05." "MPlayer Project" "A film lejátszó"
 .
 .SH NÉV
 mplayer  \- film lejátszó
@@ -3092,8 +3092,8 @@ Ha egy külső ablak is meg van adva a \-win opcióval, akkor az x és y
 koordináták az ablak bal felső sarkához viszonyulnak a képernyő helyett.
 .br
 .I MEGJEGYZÉS:
-Ezt az opciót csak az x11, xmga, xv, xvmc, xvidix, gl, gl2, directx és
-tdfxfb videó kimeneti vezérlők támogatják.
+Ezt az opciót csak az x11, xmga, xv, xvmc, xvidix, gl, gl2, directx,
+fbdev és tdfxfb videó kimeneti vezérlők támogatják.
 .sp 1
 .I PÉLDA:
 .PD 0
@@ -4226,6 +4226,8 @@ Minden fájl neve a képkocka sorszáma lesz vezető nullákkal.
 .IPs z=<0\-9>
 Megadja a tömörítési szintet.
 0-val nincs tömörítés, 9 a maximális tömörítés.
+.IPs outdir=<könyvtárnév>
+Megadja a könyvtárat, ahova a PNG fájlokat menteni kell (alapértelmezett: ./).
 .RE
 .PD 1
 .
@@ -4507,8 +4509,21 @@ Ez nem hiba, hanem a nem teljes felbontású dekódolás mellékhatásai.
 Ha a <w> is meg van adva, a lowres dekódolás csak akkor lesz használva, ha a
 videó szélessége nagyobb vagy egyenlő mint <w>.
 .RE
-.IPs "o\ \ \ \ "
-FIXME: nem dokumentált
+.B o=<kulcs>=<érték>[,<kulcs>=<érték>[,...]]
+AVOptions átadása a libavcodec dekódolójának.
+Megjegyezzük, hogy az o= kapcsolót feleslegessé tevő, az összes ismeretlen
+opciót az AVOption rendszernek átadó javítást szívesen fogadunk.
+Az AVOptions teljes listája megtalálható az FFmpeg kézikönyvében.
+Figyelj rá, hogy néhány opció ütközhet a MEncoder kapcsolóival.
+.sp 1
+.RS
+.I PÉLDA:
+.RE
+.RSs
+.PD 0
+.IPs o=debug=pict
+.PD 1
+.RE
 .IPs "sb=<szám> (csak MPEG-2)"
 Kihagyja a megadott számú makroblokk sort a tetején.
 .IPs "st=<szám> (csak MPEG-2)"
@@ -7652,9 +7667,11 @@ Nézd meg a forrást a részletekért.
 .
 .TP
 .B o=<kulcs>=<érték>[,<kulcs>=<érték>[,...]]
-AVOption átadása a libavcodec-nek
-Emlékezz rá, hogy az o= kapcsolót feleslegessé tevő, az összes ismeretlen
-opciót a AVOption rendszernek átadó javítást szívesen fogadunk.
+AVOption átadása a libavcodec kódolójának.
+Megjegyezzük, hogy az o= kapcsolót feleslegessé tevő, az összes ismeretlen
+opciót az AVOption rendszernek átadó javítást szívesen fogadunk.
+Az AVOptions teljes listája megtalálható az FFmpeg kézikönyvében.
+Figyelj rá, hogy néhány opció ütközhet a MEncoder kapcsolóival.
 .sp 1
 .RS
 .I PÉLDA:
@@ -10498,8 +10515,21 @@ A folyam tulajdonságainak megállapításához maximálisan analizálndó hossz másodpe
 Kényszeríti a megadott libavformat demuxer-t.
 .
 .TP
-.B "o\ \ \ \ \ \ "
-FIXME: nem dokumentált
+.B o=<kulcs>=<érték>[,<kulcs>=<érték>[,...]]
+AVOptions átadása a libavformat demuxer-ének.
+Megjegyezzük, hogy az o= kapcsolót feleslegessé tevő, az összes ismeretlen
+opciót az AVOption rendszernek átadó javítást szívesen fogadunk.
+Az AVOptions teljes listája megtalálható az FFmpeg kézikönyvében.
+Figyelj rá, hogy néhány opció ütközhet az MPlayer/MEncoder kapcsolóival.
+.sp 1
+.RS
+.I PÉLDA:
+.RE
+.RSs
+.PD 0
+.IPs o=ignidx
+.PD 1
+.RE
 .
 .TP
 .B probesize=<érték>
@@ -10555,6 +10585,8 @@ MPEG-4 formátum
 MPEG-4 formátum extra fejléc flag-ekkel, melyek az Apple iPod firmware-jének kellenek
 .IPs "dv\ \ \ "
 Sony Digital Video konténer
+.IPs "matroska\ \ \ "
+Matroska
 .RE
 .PD 1
 .TP
@@ -10564,8 +10596,21 @@ jelenleg csak MPEG[12] esetén van értelme.
 Néha szükséges növelni a "buffer alulcsordulás" elkerüléséhez.
 .
 .TP
-.B "o\ \ \ \ \ \ "
-FIXME: nem dokumentált
+.B o=<kulcs>=<érték>[,<kulcs>=<érték>[,...]]
+AVOptions átadása a libavformat muxer-ének.
+Megjegyezzük, hogy az o= kapcsolót feleslegessé tevő, az összes ismeretlen
+opciót az AVOption rendszernek átadó javítást szívesen fogadunk.
+Az AVOptions teljes listája megtalálható az FFmpeg kézikönyvében.
+Figyelj rá, hogy néhány opció ütközhet a MEncoder kapcsolóival.
+.sp 1
+.RS
+.I PÉLDA:
+.RE
+.RSs
+.PD 0
+.IPs o=packetsize=100
+.PD 1
+.RE
 .
 .TP
 .B packetsize=<méret>
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 exam