Merge svn changes up to r27899

23 files changed, 743 insertions, 1918 deletions

diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index bd1f196ced..d50c7db692 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -105,7 +105,7 @@ cue://file[:track]
 .
 .br
 .B mplayer
-[file|mms[t]|http|http_proxy|rt[s]p|ftp|udp|unsv|smb]://
+[file|mms[t]|http|http_proxy|rt[s]p|ftp|udp|unsv|icyx|noicyx|smb]://
 [user:pass@]URL[:port] [options]
 .
 .br
@@ -2648,6 +2648,12 @@ the maximum, which e.g.\& the OSD cannot display correctly.
 Set the step size of mixer volume changes in percent of the whole range
 (default: 3).
 .
+.TP
+.B \-volume <-1\-100> (also see \-af volume)
+Set the startup volume in the mixer, either hardware or software (if
+used with \-softvol).
+A value of -1 (the default) will not change the volume.
+.
 .
 .
 .SH "AUDIO OUTPUT DRIVERS (MPLAYER ONLY)"
@@ -10114,7 +10120,7 @@ enabled during all mode decisions (slow, requires subq>=6)
 .PD 1
 .
 .TP
-.B psy-rd=rd[:trell]
+.B psy-rd=rd[,trell]
 Sets the strength of the psychovisual optimization.
 .PD 0
 .RSs
diff --git a/DOCS/man/es/mplayer.1 b/DOCS/man/es/mplayer.1
index 7938d1068f..31229b82b5 100644
--- a/DOCS/man/es/mplayer.1
+++ b/DOCS/man/es/mplayer.1
@@ -2360,6 +2360,12 @@ debajo del m�ximo, p.e.\& el OSD no se mostrar� correctamente.
 Establece el porcentaje de incremento o decremento para los cambios de volumen,
 el porcentaje es en relaci�n con el total.
 .
+.TP
+.B \-volume <-1\-100> (vea tambi�n \-af volume)
+Establece el volumen inicial en el mezclador, ya sea por hardware o
+software (si se usa con \-softvol).
+Un valor de -1 (que es el valor por defecto) no cambiar� el volumen.
+.
 .
 .
 .SH "CONTROLADORES DE SALIDA DE AUDIO (MPLAYER SOLAMENTE)"
diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1
index 22549f410f..40f342be46 100644
--- a/DOCS/man/fr/mplayer.1
+++ b/DOCS/man/fr/mplayer.1
@@ -1,4 +1,4 @@
-.\" synced with r27691
+.\" synced with r27895
 .\" Encoding: iso-8859-1
 .\" MPlayer (C) 2000-2008 MPlayer Team
 .\" The English man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann
@@ -108,7 +108,7 @@ cue://fichier[:piste]
 .
 .br
 .B mplayer
-[file|mms[t]|http|http_proxy|rt[s]p|ftp|udp|unsv|smb]://
+[file|mms[t]|http|http_proxy|rt[s]p|ftp|udp|unsv|icyx|noicyx|smb]://
 [utilisateur:mot_de_passe@]URL[:port] [options]
 .
 .br
@@ -2712,6 +2712,12 @@ sans '.idx', '.ifo' ou '.sub'.
 .B \-vobsubid <0\-31>
 D�finit le num�ro de sous-titre du fichier VOBsub.
 .
+.TP
+.B \-volume <-1\-100> (voir aussi \-af volume)
+D�fini le niveau de d�marrage du volume mixeur, soit mat�riel ou mat�riel
+(si l'option \-softvol est aussi activ�e).
+La valeur -1 (par d�faut) ne change pas le volume.
+.
 .
 .SH "OPTIONS DE SORTIE AUDIO (MPLAYER UNIQUEMENT)"
 .
@@ -3382,13 +3388,13 @@ N'est pas g�r� par tous les pilotes de sortie vid�o.
 .
 .TP
 .B \-screenh <pixels>
-D�finit la r�solution verticale de votre �cran pour des pilotes de
+D�finit la hauteur de votre �cran pour des pilotes de
 sortie vid�o qui ne connaissent pas la r�solution de l'�cran, comme
 fbdev, x11 et TVout
 .
 .TP
 .B \-screenw <pixels>
-D�finit la r�solution horizontale de votre �cran pour des pilotes de
+D�finit la largeur de votre �cran pour des pilotes de
 sortie vid�o qui ne connaissent pas la r�solution de l'�cran, comme
 fbdev, x11 et TVout
 .
@@ -10588,7 +10594,7 @@ rayon de de la recherche exhaustive et multi-hexagonale de mouvement
 (par d�faut\ 16)
 .
 .TP
-.B subq=<1\-7>
+.B subq=<1\-9>
 Ajuste la qualit� d'affinement de subpel.
 Ce param�tre contr�le le compromis qualit�/\:vitesse li� aux d�cisions du
 processus d'estimation du mouvement.
@@ -10617,13 +10623,21 @@ Puis termine l'affinement quarterpixel pour ce type
 .IPs 5
 Effectue la recherche de mouvement de la meilleure qualit� sur tous les
 types de macro-blocs candidats, avant de choisir le meilleur type.
-(par d�faut)
+Affine aussi les deux vecteurs de mouvement utilis�s par les macro-blocs
+bi-directionnels, au lieu de r�-utiliser les vecteurs des recherches
+avant et arri�re.
 .IPs 6
 Active la s�lection des macro-blocs en fonction de leur taux de distortion,
-pour les trames-I et P.
+pour les trames-I et P (par d�faut).
 .IPs 7
-Active la s�lection des macro-blocs en fonction de leur taux de distortion,
-pour les vecteurs de mouvement et les modes intras (le meilleur).
+Active la s�lection des macro-blocs en fonction de leur taux de distortion dans
+toutes les trames.
+.IPs 8
+Active la s�lection des vecteurs de mouvement et des modes de pr�dictions intra
+en fonction de leur taux de distortion dans les trames-I et -P.
+.IPs 9
+Active la s�lection des vecteurs de mouvement et des modes de pr�dictions intra
+en fonction de leur taux de distortion dans toutes les trames (le meilleur).
 .RE
 .PD 1
 .RS
@@ -10646,20 +10660,7 @@ Sans cette option, tout le macro-bloc doit utiliser la m�me r�f�rence.
 N�cessite frameref>1.
 .TP
 .
-.TP
-.B (no)brdo
-Active l'optimisation du type de macroblocs dans les trames-B d'apr�s
-leur taux de distortion
-N�cessite subq>=6.
-.
-.TP
-.B (no)bime
-Affine les deux vecteurs de mouvement utilis�s par les macro-blocs
-bi-directionnels, au lieu de r�-utiliser les vecteurs des recherches
-avant et arri�re.
-Cette option n'a pas d'effet sans trames-B.
-.
-.B trellis=<0\-2>
+.B trellis=<0\-2> (cabac uniquement)
 quatification optimale du point de vue du taux de distortion
 .PD 0
 .RSs
@@ -10674,6 +10675,18 @@ subq>=6)
 .PD 1
 .
 .TP
+.B psy-rd=rd[,trell]
+D�fini la force de l'optimisation psycho-visuelle.
+.PD 0
+.RSs
+.IPs rd=<0.0\-10.0>
+force de l'optimisation psy (requi�re subq>=6) (defaut\ : 1.0)
+.IPs trell=<0.0\-10.0>
+trellis (requi�re trellis, exp�rimental) (default\ : 0.0)
+.RE
+.PD 1
+.
+.TP
 .B deadzone_inter=<0\-32>
 D�fini la taille de la zone morte de quantification luma inter pour
 la quantification non-tellis (par d�faut\ : 21).
diff --git a/DOCS/man/ru/mplayer.1 b/DOCS/man/ru/mplayer.1
index 8f4942c356..12cb21f5b9 100644
--- a/DOCS/man/ru/mplayer.1
+++ b/DOCS/man/ru/mplayer.1
@@ -1892,7 +1892,7 @@ tv://1, tv://TV1, tv_set_channel 1, tv_set_channel TV1
 .B \-tvscan <option1:option2:...> (������ TV � MPlayer)
 ����������� ������� TV �������.
 MPlayer ����� ������� �������� ��� ����� "-tv channels=",
-������� ��� ������������ � ������ ��� ���������� ������.
+������� ��� ������������ � ������ ��� ��������� ������.
 .sp 1
 ��������� ��������:
 .RSs
diff --git a/DOCS/xml/en/bugs.xml b/DOCS/xml/en/bugs.xml
index 35e0b55c1b..565dedf200 100644
--- a/DOCS/xml/en/bugs.xml
+++ b/DOCS/xml/en/bugs.xml
@@ -8,13 +8,6 @@
 
 <itemizedlist>
 <listitem>
-  <para>SIGILL (signal 4) on P3 using 2.2.x kernels:</para>
-  <para>Problem: kernel 2.2.x doesn't have proper (working) SSE support</para>
-  <para>Solution: upgrade kernel to 2.4.x</para>
-  <para>Workaround: <command>./configure --disable-sse</command></para>
-</listitem>
-
-<listitem>
   <para>General SIGILL (signal 4):</para>
   <para>
   Problem: you compiled and run <application>MPlayer</application> on
@@ -139,78 +132,6 @@
 </itemizedlist>
 </sect2>
 
-<!-- ********** -->
-
-<sect2 id="bugs-nosound">
-<title>No sound at all</title>
-
-<itemizedlist>
-<listitem>
-  <para>your file uses an unsupported audio codec</para>
-  <para>
-  Solution: read the documentation and help us adding support for it
-  </para>
-</listitem>
-</itemizedlist>
-</sect2>
-
-<!-- ********** -->
-
-<sect2 id="bugs-nopicture">
-<title>No picture at all (just plain grey/green window)</title>
-
-<itemizedlist>
-<listitem>
-  <para>your file uses an unsupported video codec</para>
-  <para>
-  Solution: read the documentation and help us adding support for it
-  </para>
-</listitem>
-
-<listitem>
-  <para>
-  auto-selected codec can't decode the file, try to select another using
-  <option>-vc</option> or <option>-vfm</option> options
-  </para>
-</listitem>
-</itemizedlist>
-</sect2>
-
-<!-- ********** -->
-
-<sect2 id="bugs-video">
-<title>Video-out problems</title>
-
-<para>
-First note that the options <option>-fs</option>, <option>-vm</option> and
-<option>-zoom</option> are not supported by all drivers. Plus, not all
-drivers support scaling/zooming in hardware.
-</para>
-
-<formalpara>
-<title>OSD/sub flickering</title>
-<para>
-<itemizedlist>
-  <listitem><para>x11 driver: sorry, it can't be fixed now</para></listitem>
-  <listitem><para>xv driver: use <option>-double</option> option</para></listitem>
-</itemizedlist>
-</para>
-</formalpara>
-
-<formalpara>
-<title>Green image using mga_vid
-  (<option>-vo mga</option> / <option>-vo xmga</option>)</title>
-<para>
-<itemizedlist>
-<listitem><para>
-  mga_vid misdetected your card's RAM amount, reload it using
-  <option>mga_ram_size</option> option.
-</para></listitem>
-</itemizedlist>
-</para>
-</formalpara>
-
-</sect2>
 </sect1>
 
 </appendix>
diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml
index bb63a39cc0..42af3a1be8 100644
--- a/DOCS/xml/en/codecs.xml
+++ b/DOCS/xml/en/codecs.xml
@@ -17,136 +17,6 @@ please read the <link linkend="codec-importing">codec importing HOWTO</link>
 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 &amp;&amp; ./configure</screen>
-  You may have to add some options (examine the output of
-  <command>./configure --help</command>).
-</para></step>
-<step><para>
-  <screen>make &amp;&amp; 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 &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>
-</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>
-
 
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
diff --git a/DOCS/xml/en/install.xml b/DOCS/xml/en/install.xml
index 1dd915f1cf..25440e429c 100644
--- a/DOCS/xml/en/install.xml
+++ b/DOCS/xml/en/install.xml
@@ -87,7 +87,7 @@ answers.
 </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
+  - optional, for fast integer-only MP3 decoding on FPU-less platforms
 </para></listitem>
 </itemizedlist>
 </sect1>
@@ -347,6 +347,158 @@ the Preferences menu is currently UNIMPLEMENTED!
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
 
+<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 &amp;&amp; ./configure</screen>
+  You may have to add some options (examine the output of
+  <command>./configure --help</command>).
+</para></step>
+<step><para>
+  <screen>make &amp;&amp; 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 &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>
+</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>
 
diff --git a/DOCS/xml/hu/codecs.xml b/DOCS/xml/hu/codecs.xml
index eb2619f375..190ef0ea50 100644
--- a/DOCS/xml/hu/codecs.xml
+++ b/DOCS/xml/hu/codecs.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- synced with r27102 -->
+<!-- synced with r27852 -->
 <chapter id="codecs">
 <title>Codec-ek</title>
 
-<sect1 id="video-codecs">
-<title>Videó codec-ek</title>
-
 <para>
 A <ulink url="../../codecs-status.html">codec státusz táblázat</ulink>
 tartalmazza az összes támogatott codec-et, napi frissítéssel.
@@ -14,328 +11,11 @@ Néhány MPlayerrel használható bináris codec elérhető a weboldalunk
 </para>
 
 <para>
-A legfontosabb dolgok:
-</para>
-
-<itemizedlist>
-<listitem><para>
-  <emphasis role="bold">MPEG-1</emphasis> (<emphasis role="bold">VCD</emphasis>) és
-  <emphasis role="bold">MPEG-2</emphasis> (<emphasis role="bold">DVD</emphasis>) videó
-</para></listitem>
-<listitem><para>
-  natív dekódolók <emphasis role="bold">az összes DivX variánshoz,
-  3ivX-hez, Microsoft MPEG-4</emphasis> v1, v2 és más MPEG4 variánsokhoz
-</para></listitem>
-<listitem><para>
-  natív dekódoló <emphasis role="bold">Windows Media Video 7/8</emphasis>
-  (<emphasis role="bold">WMV1/WMV2</emphasis>), és Win32 DLL dekódoló
-  a <emphasis role="bold">Windows Media Video 9</emphasis> formátumhoz
-  (<emphasis role="bold">WMV3</emphasis>),
-  mindkettőt a <filename>.wmv</filename> fájloknál használjuk
-</para></listitem>
-<listitem><para>
-  natív <emphasis role="bold">Sorenson 1 (SVQ1)</emphasis> dekódoló
-</para></listitem>
-<listitem><para>
-  natív <emphasis role="bold">Sorenson 3 (SVQ3)</emphasis> dekódoló
-</para></listitem>
-<listitem><para>
-  <emphasis role="bold">3ivx</emphasis> v1, v2 dekódoló
-</para></listitem>
-<listitem><para>
-  Cinepak és <emphasis role="bold">Intel Indeo</emphasis> codec
-  (3.1,3.2,4.1,5.0)
-</para></listitem>
-<listitem><para>
-  <emphasis role="bold">MJPEG</emphasis>, AVID, VCR2, ASV2 és más hardveres
-  formátumok
-</para></listitem>
-<listitem><para>
-  VIVO 1.0, 2.0, I263 és egyéb <emphasis role="bold">H.263(+)</emphasis>
-  variánsok
-</para></listitem>
-<listitem><para>
-  FLI/FLC
-</para></listitem>
-<listitem><para>
-  <emphasis role="bold">RealVideo 1.0 &amp; 2.0</emphasis> a
-  <systemitem class="library">libavcodec</systemitem>-ből és
-  <emphasis role="bold">RealVideo 3.0 &amp; 4.0</emphasis> codec a
-  RealPlayer könyvtárak felhasználásával
-</para></listitem>
-<listitem><para>
-  natív dekódoló HuffYUV-hoz
-</para></listitem>
-<listitem><para>
-  különböző régi, egyszerű, RLE-szerű formátum
-</para></listitem>
-</itemizedlist>
-
-<para>
-Ha van olyan Win32 codec-ed, ami nincs a listában és még nem támogatott,
+Ha van olyan Win32 codec-ed, ami még nem támogatott,
 olvasd el a <link linkend="codec-importing">codec importálás HOGYAN</link>-t
 és segítsd a munkánkat.
 </para>
 
-<!-- ********** -->
-
-<sect2 id="ffmpeg" xreflabel="FFmpeg/libavcodec">
-<title>FFmpeg/libavcodec</title>
-
-<para>
-Az <ulink url="http://ffmpeg.org">FFmpeg</ulink> tartalmazza
-a <systemitem class="library">libavcodec</systemitem>-et, a
-vezető nyílt forráskódú videó és audió codec függvénykönyvtárat.
-Képes a legtöbb multimédiás formátum dekódolására, általában az
-alternatíváknál gyorsabban, valamint egyre több formátumot támogat.
-Ez az alapértelmezett dekódoló az <application>MPlayer</application>
-által támogatott codec-ek nagy részénél. A kódolás szintén
-lehetséges pár formátumba, melyeket támogat is a
-<application>MEncoder</application>.
-</para>
-
-<para>
-Az összes támogatott
-<ulink url="http://ffmpeg.mplayerhq.hu/general.html#SEC6">videó</ulink>
-és <ulink url="http://ffmpeg.mplayerhq.hu/general.html#SEC7">audió</ulink>
-codec-ek listájáért látogasd meg az FFmpeg weboldalát.
-</para>
-
-<para>
-Az <application>MPlayer</application> tartalmazza a
-<systemitem class="library">libavcodec</systemitem>-et.
-Csak futtasd a <filename>./configure</filename>-t és fordíts.
-</para>
-</sect2>
-
-<!-- ********** -->
-
-<sect2 id="xvid">
-<title>Xvid</title>
-
-<para>
-Az <ulink url="http://www.xvid.org">Xvid</ulink> egy szabad szoftveres MPEG-4
-ASP kompatibilis videó codec, ami tud két lépésben kódolni és teljes MPEG-4
-ASP támogatás van benne, ezáltal sokkal hatékonyabb, mint a jólismert DivX
-codec. Nagyon jó videó minőséget kínál és a CPU optimalizációknak hála a
-legtöbb modern processzoron a teljesítménye is jó.
-</para>
-
-<para>
-Az OpenDivX codec forkolt fejlesztésként indult annak idején.
-A fork akkor történt, amikor a ProjectMayo az OpenDivX-et zárt forráskódúvá
-tette DivX4 néven, felbosszantva így a nem-ProjectMayo-s fejlesztőket,
-akik az OpenDivX-en dolgoztak, s akik így elindították az Xvid-et. Így mindkét
-projektnek azonosak a gyökereik.
-</para>
-
-<para>
-Jegyezd meg, hogy az Xvid nem szükséges az Xvid-es videók dekódolásához.
-A <systemitem class="library">libavcodec</systemitem> az alapértelmezett,
-mivel jobb a sebessége.
-</para>
-
-<procedure>
-<title>Az <systemitem class="library">Xvid</systemitem> telepítése</title>
-<para>
-  Mint a legtöbb nyílt forráskódú program, ez is két formában érhető el:
-  <ulink url="http://www.xvid.org/downloads.html">hivatalos kiadás</ulink>
-  és a CVS verzió.
-  A CVS verzió általában elég stabil a használathoz, mivel legtöbbször csak
-  a kiadásokban benne lévő hibák javításait tartalmazza.
-  Itt van lépésről lépésre, hogy mit kell tenned, ha az <systemitem class="library">Xvid</systemitem>
-  CVS-t használni akarod a <application>MEncoder</application>rel (szükséged
-  lesz az <application>autoconf</application> 2.50-re, az <application>automake</application>-re
-  és a <application>libtool</application>-ra):
-</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</screen>
-</para></step>
-<step><para>
-  <screen>./configure</screen>
-  Meg kell adnod pár kapcsolót (tanulmányozd a
-  <command>./configure --help</command> kimenetét).
-</para></step>
-<step><para>
-  <screen>make &amp;&amp; make install</screen>
-</para></step>
-<step><para>
-  Ha megadtad a <option>--enable-divxcompat</option> kapcsolót,
-  másold át a <filename>../../src/divx4.h</filename> fájlt a
-  <filename class="directory">/usr/local/include/</filename>könyvtárba.
-</para></step>
-<step><para>
-  Fordítsd újra az <application>MPlayer</application>t.
-</para></step>
-</procedure>
-</sect2>
-
-<!-- ********** -->
-
-<s