oh my god what have i done...

format.html, codecs, video, sound.html renumbered, etc


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2746 b3059339-0415-0410-9bf9-f77b7e298cf2

6 files changed, 306 insertions, 157 deletions

diff --git a/DOCS/codecs.html b/DOCS/codecs.html
index 27ed9dc721..3ff7cb74cc 100644
--- a/DOCS/codecs.html
+++ b/DOCS/codecs.html
@@ -3,32 +3,15 @@
 
 <FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>
 
-<P><B><A NAME=2.1>2.1. Video Formats, Audio &amp; Video Codecs</A></B></P>
+<P><B><A NAME=2.2>2.2.  Supported codecs</A></B></P>
 
-<P><B><A NAME=2.1.1>2.1.1. Supported input formats</A></B></P>
 
-<P><B>MPlayer</B> can read/play from the following devices/formats:<BR>
-<UL>
-<LI> VCD (Video CD) directly from CD-ROM or from CDRwin's .bin image file     
-<LI> DVD, directly from your DVD disk, using libdvdread for decryption
-<LI> MPEG 1/2 System Stream (PS/PES/VOB) and Elementary Stream (ES) file
-     formats
-<LI> RIFF AVI file format
-<LI> ASF/WMV 1.0 file format
-<LI> QT/MOV file format with (un)compressed headers
-<LI> VIVO format (.viv files)
-<LI> supports reading from file, stdin, or network via HTTP
-</UL></P>
-
-<P>Note: about realmedia (.ra/.rm) support read the FAQ!</P>
-
-
-<P><B><A NAME=2.1.2>2.1.2. Supported audio &amp; video codecs</A></B></P>
+<P><B><A NAME=2.2.1>2.2.1. Video codecs</A></B></P>
 
 <P>See <A HREF="http://www.mplayerhq.hu/DOCS/codecs-status.html">http://www.mplayerhq.hu/DOCS/codecs-status.html</A> for the complete,
 daily generated list!!!</P>
 
-<P>The most important video codecs:<BR>
+<P>The most important ones above all:<BR>
 <UL>
 <LI>MPEG1 (VCD) and MPEG2 (DVD) video</LI>
 <LI>DivX ;-), OpenDivX (DivX4), 3ivx and other MPEG4 variants</LI>
@@ -36,22 +19,14 @@ daily generated list!!!</P>
 <LI>Intel Indeo codecs (3.1,3.2,4.1,5.0)</LI>
 <LI>MJPEG, ASV2 and other hardware formats</LI>
 <LI>XAnim codecs</LI>
+<LI>VIVO</LI>
 </UL></P>
 
-<P>The most important audio codecs:<BR>
-<UL>
-<LI>MPEG layer 2, and layer 3 (MP3) audio (native code, with MMX/SSE/3DNow! optimization)</LI>
-<LI>AC3 dolby audio (native code, with SSE/3DNow! optimization)</LI>
-<LI>Ogg Vorbis audio codec (native lib)</LI>
-<LI>Voxware audio (using directshow DLL)</LI>
-<LI>alaw, msgsm, pcm and other simple old audio formats</LI>
-</UL></P>
-
-<P>If you have a codec not listed here, and not supported yet, just read <A
-HREF="#2.1.3">section 2.1.3</A> to get info about how to help us adding support
+<P>If you have a Win32 codec not listed here, and not supported yet, just read the <A
+HREF="#2.2.3">codec importing</A> to get info about how to help us adding support
 for it!</P>
 
-<P><B><A NAME=2.1.2.1>2.1.2.1. DivX4</A></B></P>
+<P><B><A NAME=2.2.1.1>2.2.1.1. DivX4</A></B></P>
 
 <P>This section contains information about the DivX4 codec of
 <A HREF="http://www.projectmayo.com">ProjectMayo</A>. Their first available alpha version was the OpenDivX 4.0
@@ -110,7 +85,7 @@ differ according to the current bpp.</P>
 <TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>hard prostprocessing, eats many CPU (like level 4 with divxds</TD><TR>
 </TABLE></P>
 
-<P><B><A NAME=2.1.2.2>2.1.2.2. ffmpeg's DivX/libavcodec</A></B></P>
+<P><B><A NAME=2.2.1.2>2.2.1.2. ffmpeg's DivX/libavcodec</A></B></P>
 
 <P>Beginning with version 0.4.2 , <A HREF="http://ffmpeg.sourceforge.net">ffmpeg</A> contains an <B>opensource</B> DivX codec,
 which is compatible with the traditional DivX. <B>MPlayer</B> supports this codec,
@@ -150,15 +125,7 @@ Then <B>MPlayer</B> always uses <B>ffdivx/ffodivx</B> to decode
 highest resolution DivX/DivX4 movies on my K6/2 500, without framedrop.</P>
 
 
-<P><B><A NAME=2.1.2.3>2.1.2.3.  Hardware AC3 decoding</A></B></P>
-
-<P>You'll need an AC3 capable soundcard, with digital out (SP/DIF). The
-card's driver must support the AFMT_AC3 format (like SB Live! does).
-Connect your AC3 decoder to the SP/DIF output, and use the '-ac hwac3'
-option. It may or may not work (experimental). (probably won't...)</P>
-
-
-<P><B><A NAME=2.1.2.4>2.1.2.4.  XAnim codecs</A></B></P>
+<P><B><A NAME=2.2.1.3>2.2.1.3.  XAnim codecs</A></B></P>
 
 <P>Foreword: using (some) XAnim codecs with other program than XAnim, is
 <B><I>ILLEGAL</I></B>. It is <B>YOUR</B> responsibility to read its license,
@@ -185,7 +152,43 @@ option to tell <B>MPlayer</B> to use them if possible.</P>
 <P>Tested codecs are: <B>Indeo 3.2</B>, <B>4.1</B>, <B>5.0</B>, <B>CVID</B>, <B>3ivX</B>, <B>h263</B>.</P>
 
 
-<P><B><A NAME=2.1.2.5>2.1.2.5.  libmad support</A></B></P>
+<P><B><A NAME=2.2.1.4>2.2.1.4.  VIVO video</A></B></P>
+
+<P>TODO</P>
+
+
+<P><B><A NAME=2.2.1.5>2.2.1.5.  MPEG 1/2 video</A></B></P>
+
+<P>MPEG1 and MPEG2 are decoded with the native library <B>libmpeg2</B>.
+Its source code is included in <B>MPlayer</B>, and of course is multiplatform.
+We handle buggy MPEG1/2 video files by checking for what signature does
+libmpeg2 return, and when it gives sig11 (segmentation fault), we quickly
+reinitialize the codec, and continue exactly from where the failure did occur.
+No speed decrease is measurable.</P>
+
+
+<P><B><A NAME=2.2.2>2.2.2.  Audio codecs</A></B></P>
+
+<P>The most important audio codecs above all :<BR>
+<UL>
+<LI>MPEG layer 2, and layer 3 (MP3) audio (<B>native</B> code, with MMX/SSE/3DNow! optimization)</LI>
+<LI>MPEG layer 1 audio (<B>native</B> code, with libavcodec)</LI>
+<LI>AC3 Dolby audio (<B>native</B> code, with SSE/3DNow! optimization)</LI>
+<LI>Ogg Vorbis audio codec (<B>native</B> lib)</LI>
+<LI>Voxware audio (using DirectShow DLL)</LI>
+<LI>alaw, msgsm, pcm and other simple old audio formats</LI>
+</UL></P>
+
+
+<P><B><A NAME=2.2.2.1>2.2.2.1.  Hardware AC3 decoding</A></B></P>
+
+<P>You'll need an AC3 capable soundcard, with digital out (SP/DIF). The
+card's driver must support the AFMT_AC3 format (like SB Live! does).
+Connect your AC3 decoder to the SP/DIF output, and use the '-ac hwac3'
+option. It may or may not work (experimental). (probably won't...)</P>
+
+
+<P><B><A NAME=2.2.2.2>2.2.2.2.  libmad support</A></B></P>
 
 <P><A HREF="http://mad.sourceforge.net">libmad</A> is a multiplatform MPEG audio
 decoding library. If you don't know why is it good, you probably don't need it.</P>
@@ -194,9 +197,9 @@ decoding library. If you don't know why is it good, you probably don't need it.<
 option.</P>
 
 
-<P><B><A NAME=2.1.3>2.1.3. Codec importing howto</A></B></P>
+<P><B><A NAME=2.2.3>2.2.3. Win32 codec importing howto</A></B></P>
 
-<P><B><A NAME=2.1.3.1>2.1.3.1. VFW codecs</A></B></P>
+<P><B><A NAME=2.2.3.1>2.2.3.1. VFW codecs</A></B></P>
 
 <P>VfW (Video for Windows) is the old Video API for Windows. Its codecs have
 the .DLL or (rarely) .DRV extension.
@@ -224,7 +227,7 @@ your codec support request in mail, and upload these files to the FTP:</P>
 <P>&nbsp;&nbsp;&nbsp;&nbsp;<CODE>ftp://ftp.mplayerhq.hu/MPlayer/incoming/[codecname]/</CODE></P>
 
 
-<P><B><A NAME=2.1.3.2>2.1.3.2. DirectShow codecs</A></B></P>
+<P><B><A NAME=2.2.3.2>2.2.3.2. DirectShow codecs</A></B></P>
 
 <P>DirectShow is the newer Video API, which is even worse than its predecessor.
 Things are harder with DirectShow, since
diff --git a/DOCS/documentation.html b/DOCS/documentation.html
index 1ef02a6774..f4155c09f3 100644
--- a/DOCS/documentation.html
+++ b/DOCS/documentation.html
@@ -29,72 +29,88 @@
   </UL>
   <LI><A HREF="#2">2. Features</A></LI>
   <UL>
-    <LI><A HREF="codecs.html">2.1 Video Formats, Audio & Video Codecs</A></LI>
+    <LI><A HREF="formats.html">2.1 Supported formats</A></LI>
     <UL>
-      <LI><A HREF="codecs.html#2.1.1">2.1.1 Supported input formats</A></LI>
-      <LI><A HREF="codecs.html#2.1.2">2.1.2 Supported audio & video codecs</A></LI>
+      <LI><A HREF="formats.html#2.1.1">2.1.1 Video</A></LI>
       <UL>
-	<LI><A HREF="codecs.html#2.1.2.1">2.1.2.1 DivX4</A></LI>
-	<LI><A HREF="codecs.html#2.1.2.2">2.1.2.2 ffmpeg's DivX/libavcodec</A></LI>
-	<LI><A HREF="codecs.html#2.1.2.3">2.1.2.3 Hardware AC3 decoding</A></LI>
-	<LI><A HREF="codecs.html#2.1.2.4">2.1.2.4 XAnim codecs</A></LI>
-	<LI><A HREF="codecs.html#2.1.2.5">2.1.2.5 libmad support</A></LI>
+	<LI><A HREF="formats.html#2.1.1.1">2.1.1.1 MPG, VOB, DAT files</A></LI>
+	<LI><A HREF="formats.html#2.1.1.2">2.1.1.2 AVI files</A></LI>
+	<LI><A HREF="formats.html#2.1.1.3">2.1.1.3 ASF/WMV files</A></LI>
+	<LI><A HREF="formats.html#2.1.1.4">2.1.1.4 QT/MOV files</A></LI>
+	<LI><A HREF="formats.html#2.1.1.5">2.1.1.5 VIV files</A></LI>
       </UL>
-      <LI><A HREF="codecs.html#2.1.3">2.1.3 Codec importing howto</A></LI>
+      <LI><A HREF="formats.html#2.1.2">2.1.2 Audio</A></LI>
+    </UL>
+    <LI><A HREF="codecs.html#2.2">2.2 Supported codecs</A></LI>
+    <UL>
+      <LI><A HREF="codecs.html#2.2.1">2.2.1 Video</A></LI>
+      <UL>
+	<LI><A HREF="codecs.html#2.2.1.1">2.2.1.1 DivX4</A></LI>
+	<LI><A HREF="codecs.html#2.2.1.2">2.2.1.2 ffmpeg's DivX/libavcodec</A></LI>
+	<LI><A HREF="codecs.html#2.2.1.3">2.2.1.3 XAnim codecs</A></LI>
+	<LI><A HREF="codecs.html#2.2.1.4">2.2.1.4 VIVO video</A></LI>
+	<LI><A HREF="codecs.html#2.2.1.5">2.2.1.5 MPEG1/2 video</A></LI>
+      </UL>
+      <LI><A HREF="codecs.html#2.2.2">2.2.2 Audio</A></LI>
       <UL>
-	<LI><A HREF="codecs.html#2.1.3.1">2.1.3.1 VFW codecs</A></LI>
-	<LI><A HREF="codecs.html#2.1.3.2">2.1.3.2 DirectShow codecs</A></LI>
+	<LI><A HREF="codecs.html#2.2.2.1">2.2.2.1 Hardware AC3 decoding</A></LI>
+	<LI><A HREF="codecs.html#2.2.2.2">2.2.2.2 libmad support</A></LI>
+      </UL>
+      <LI><A HREF="codecs.html#2.2.3">2.2.3 Win32 codec importing howto</A></LI>
+      <UL>
+	<LI><A HREF="codecs.html#2.2.3.1">2.2.3.1 VFW codecs</A></LI>
+	<LI><A HREF="codecs.html#2.2.3.2">2.2.3.2 DirectShow codecs</A></LI>
       </UL>
     </UL>
-    <LI><A HREF="video.html">2.2 Video & Audio output devices</A></LI>
+    <LI><A HREF="video.html">2.3 Output devices</A></LI>
     <UL>
-      <LI><A HREF="video.html#2.2.1">2.2.1 Video output devices</A></LI>
+      <LI><A HREF="video.html#2.3.1">2.3.1 Video</A></LI>
       <UL>
-	<LI><A HREF="video.html#2.2.1.1">2.2.1.1 MTRR</A></LI>
-	<LI><A HREF="video.html#2.2.1.2">2.2.1.2 Xv</A></LI>
+	<LI><A HREF="video.html#2.3.1.1">2.3.1.1 Setting up MTRR</A></LI>
+	<LI><A HREF="video.html#2.3.1.2">2.3.1.2 Xv</A></LI>
 	<UL>
-	  <LI><A HREF="video.html#2.2.1.2.1">2.2.1.2.1 3dfx cards</A></LI>
-	  <LI><A HREF="video.html#2.2.1.2.2">2.2.1.2.2 S3 cards</A></LI>
-	  <LI><A HREF="video.html#2.2.1.2.3">2.2.1.2.3 nVidia cards</A></LI>
-	  <LI><A HREF="video.html#2.2.1.2.4">2.2.1.2.4 ATI cards</A></LI>
-	  <LI><A HREF="video.html#2.2.1.2.5">2.2.1.2.5 NeoMagic cards</A></LI>
+	  <LI><A HREF="video.html#2.3.1.2.1">2.3.1.2.1 3dfx</A></LI>
+	  <LI><A HREF="video.html#2.3.1.2.2">2.3.1.2.2 S3</A></LI>
+	  <LI><A HREF="video.html#2.3.1.2.3">2.3.1.2.3 nVidia</A></LI>
+	  <LI><A HREF="video.html#2.3.1.2.4">2.3.1.2.4 ATI</A></LI>
+	  <LI><A HREF="video.html#2.3.1.2.5">2.3.1.2.5 NeoMagic</A></LI>
 	</UL>
-	<LI><A HREF="video.html#2.2.1.3">2.2.1.3 DGA</A></LI>
+	<LI><A HREF="video.html#2.3.1.3">2.3.1.3 DGA</A></LI>
 	<UL>
-	  <LI><A HREF="video.html#2.2.1.3.1">2.2.1.3.1 Summary</A></LI>
-	  <LI><A HREF="video.html#2.2.1.3.2">2.2.1.3.2 What is DGA</A></LI>
-	  <LI><A HREF="video.html#2.2.1.3.3">2.2.1.3.3 Installing DGA support for MPlayer</A></LI>
-	  <LI><A HREF="video.html#2.2.1.3.4">2.2.1.3.4 Resolution switching</A></LI>
-	  <LI><A HREF="video.html#2.2.1.3.5">2.2.1.3.5 DGA & MPlayer</A></LI>
-	  <LI><A HREF="video.html#2.2.1.3.6">2.2.1.3.6 Features of the DGA driver</A></LI>
-	  <LI><A HREF="video.html#2.2.1.3.7">2.2.1.3.7 Speed issues</A></LI>
-	  <LI><A HREF="video.html#2.2.1.3.8">2.2.1.3.8 Known bugs</A></LI>
-	  <LI><A HREF="video.html#2.2.1.3.9">2.2.1.3.9 Future work</A></LI>
-	  <LI><A HREF="video.html#2.2.1.3.A">2.2.1.3.A Some modelines</A></LI>
-	  <LI><A HREF="video.html#2.2.1.3.B">2.2.1.3.B Bug Reports</A></LI>
+	  <LI><A HREF="video.html#2.3.1.3.1">2.3.1.3.1 Summary</A></LI>
+	  <LI><A HREF="video.html#2.3.1.3.2">2.3.1.3.2 What is DGA</A></LI>
+	  <LI><A HREF="video.html#2.3.1.3.3">2.3.1.3.3 Installing DGA support for MPlayer</A></LI>
+	  <LI><A HREF="video.html#2.3.1.3.4">2.3.1.3.4 Resolution switching</A></LI>
+	  <LI><A HREF="video.html#2.3.1.3.5">2.3.1.3.5 DGA & MPlayer</A></LI>
+	  <LI><A HREF="video.html#2.3.1.3.6">2.3.1.3.6 Features of the DGA driver</A></LI>
+	  <LI><A HREF="video.html#2.3.1.3.7">2.3.1.3.7 Speed issues</A></LI>
+	  <LI><A HREF="video.html#2.3.1.3.8">2.3.1.3.8 Known bugs</A></LI>
+	  <LI><A HREF="video.html#2.3.1.3.9">2.3.1.3.9 Future work</A></LI>
+	  <LI><A HREF="video.html#2.3.1.3.A">2.3.1.3.A Some modelines</A></LI>
+	  <LI><A HREF="video.html#2.3.1.3.B">2.3.1.3.B Bug Reports</A></LI>
 	</UL>
-	<LI><A HREF="video.html#2.2.1.4">2.2.1.4 SDL</A></LI>
-	<LI><A HREF="video.html#2.2.1.5">2.2.1.5 SVGAlib</A></LI>
-	<LI><A HREF="video.html#2.2.1.6">2.2.1.6 Framebuffer output (FBdev)</A></LI>
-	<LI><A HREF="video.html#2.2.1.7">2.2.1.7 Matrox framebuffer (mga_vid)</A></LI>
-	<LI><A HREF="video.html#2.2.1.8">2.2.1.8 SiS 6326 framebuffer (sis_vid)</A></LI>
-	<LI><A HREF="video.html#2.2.1.9">2.2.1.9 3dfx YUV support (tdfxfb)</A></LI>
-	<LI><A HREF="video.html#2.2.1.10">2.2.1.10 OpenGL output</A></LI>
-	<LI><A HREF="video.html#2.2.1.11">2.2.1.11 AAlib - text mode displaying</A></LI>
-	<LI><A HREF="video.html#2.2.1.12">2.2.1.12 VESA - output to VESA BIOS</A></LI>
-	<LI><A HREF="video.html#2.2.1.A">2.2.1.A TVout</A></LI>
+	<LI><A HREF="video.html#2.3.1.4">2.3.1.4 SDL</A></LI>
+	<LI><A HREF="video.html#2.3.1.5">2.3.1.5 SVGAlib</A></LI>
+	<LI><A HREF="video.html#2.3.1.6">2.3.1.6 Framebuffer output (FBdev)</A></LI>
+	<LI><A HREF="video.html#2.3.1.7">2.3.1.7 Matrox framebuffer (mga_vid)</A></LI>
+	<LI><A HREF="video.html#2.3.1.8">2.3.1.8 SiS 6326 framebuffer (sis_vid)</A></LI>
+	<LI><A HREF="video.html#2.3.1.9">2.3.1.9 3dfx YUV support (tdfxfb)</A></LI>
+	<LI><A HREF="video.html#2.3.1.10">2.3.1.10 OpenGL output</A></LI>
+	<LI><A HREF="video.html#2.3.1.11">2.3.1.11 AAlib - text mode displaying</A></LI>
+	<LI><A HREF="video.html#2.3.1.12">2.3.1.12 VESA - output to VESA BIOS</A></LI>
+	<LI><A HREF="video.html#2.3.1.A">2.3.1.A TVout</A></LI>
 	<UL>
-	  <LI><A HREF="video.html#2.2.1.A.1">2.2.1.A.1 Matrox cards</A></LI>
-	  <LI><A HREF="video.html#2.2.1.A.2">2.2.1.A.2 ATI cards</A></LI>
-	  <LI><A HREF="video.html#2.2.1.A.3">2.2.1.A.3 Voodoo 3</A></LI>
+	  <LI><A HREF="video.html#2.3.1.A.1">2.3.1.A.1 Matrox</A></LI>
+	  <LI><A HREF="video.html#2.3.1.A.2">2.3.1.A.2 ATI</A></LI>
+	  <LI><A HREF="video.html#2.3.1.A.3">2.3.1.A.3 Voodoo 3/Banshee</A></LI>
 	</UL>
       </UL>
-      <LI><A HREF="sound.html#2.2.2">2.2.2 Soundcards, audio output devices</A></LI>
+      <LI><A HREF="sound.html#2.3.2">2.3.2 Audio</A></LI>
       <UL>
-	<LI><A HREF="sound.html#2.2.2.1">2.2.2.1 Soundcard experiences, recommendations</A></LI>
+	<LI><A HREF="sound.html#2.3.2.1">2.3.2.1 Soundcard experiences, recommendations</A></LI>
       </UL>
     </UL>
-    <LI><A HREF="encoding.html#2.3">2.3 Encoding with MEncoder</A></LI>
+    <LI><A HREF="encoding.html#2.4">2.4 MEncoder - An Encoder based on MPlayer</A></LI>
   </UL>
   <LI><A HREF="#3">3. Usage</A></LI>
     <UL>
@@ -153,10 +169,13 @@ all!). The another big feature of mplayer is the wide range of supported output
 drivers. It works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, AAlib, but you can
 use SDL (and this way all drivers of SDL) and some lowlevel card-specific
 drivers (for Matrox, 3Dfx and Radeon) too! Most of them supports software or
-hardware scaling, so you can enjoy movies in fullscreen. And what about the
-nice big antialiased shaded subtitles (<B>9 supported types!!!</B>) with
-european/ISO 8859-1,2 (hungarian, english, czech, etc), cyrillic, korean fonts,
-and OSD?</P>
+hardware scaling, so you can enjoy movies in fullscreen. <B>MPlayer</B>
+supports displaying through some hardware MPEG decoder boards, such as the
+<B><A HREF="http://www.mplayerhq.hu/DOCS/DVB">DVB</A></B> and <B> <A
+HREF="http://www.mplayerhq.hu/DOCS/DXR3">DXR3/Hollywood+</A></B> ! And what
+about the nice big antialiased shaded subtitles (<B>9 supported types!!!</B>)
+with european/ISO 8859-1,2 (hungarian, english, czech, etc), cyrillic, korean
+fonts, and OSD?</P>
 
 <P><B>MPlayer</B> is basically GPL, but contains some non-GPL code which is not
 allowed to be distributed in binary form, and also contains the OpenDivX
@@ -226,7 +245,8 @@ experience any problems:<BR>
   <LI><B>gcc</B> - suggested version is from <B>2.95.2</B> to <B>2.95.4</B>.
   <B>NEVER</B> use 2.96 or 3.x.x !!! They generate faulty code.</LI>
   <LI><B>XFree86</B> - suggested version is <B>always the newest (4.1.0)</B>. Normally
-  everyone wants this. If you don't know why, you <B>do</B> need it.</LI>
+  everyone wants this. If you don't know why, you <B>do</B> need it. Make
+  sure its <B>development package</B> is installed too !</LI>
   <LI><B>make</B> - suggested version is <B>always the newest</B> (at least 3.79.x). This
   usually isn't important.</LI>
   <LI><B>SDL</B> - it's not mandatory, but can help in some cases. Always
@@ -241,36 +261,42 @@ experience any problems:<BR>
 THIS!!!</I></B></A></LI>
 
 <LI>If you plan to use <B>MPlayer</B> on x86 architecture, you possibly want to use
-Win32 codecs. Download and unzip w32codecs.zip to /usr/lib/win32 .
+Win32 codecs. If you only want to play DVDs and DivXes, you probably don't
+want these, since the <B>libavcodec</B>'s DivX decoder (see below) is the
+fastest decoder available, and DVD is decoded with the <B>libmpeg2</B>
+library.<BR>
+If you want to play or encode for example movies recorded with digital cameras (example:
+DV), you must install them. Download and unzip w32codecs.zip to /usr/lib/win32 .
 Note: the avifile project has similar codecs package, but it differs
 from ours, so if you want to use all supported codecs, then use
 our package! However, you can use our codecs package with avifile.</LI>
 
-<LI>If you own a Matrox G200/G400/G450/G550 card, then please see the <A HREF="video.html#2.2.1.7">2.2.1.7</A>
+<LI>If you own a Matrox G200/G400/G450/G550 card, then please see the <A HREF="video.html#2.3.1.7">mga_vid</A>
 section in order to gain big speedup. It is important to do these steps
 <I>before</I> compiling <B>MPlayer</B>, otherwise no Matrox-specific support will be
-built. Also check out the <A HREF="video.html#2.2.1.A.1">Matrox TV-out</A>
+built. Also check out the <A HREF="video.html#2.3.1.A.1">Matrox TV-out</A>
 section.</LI>
 
 <LI>If you own a 3Dfx Voodoo3/Banshee card, then please see the <A
-HREF="video.html#2.2.1.9">2.2.1.9</A> section in order to gain big speedup. It
+HREF="video.html#2.3.1.9">2.3.1.9</A> section in order to gain big speedup. It
 is important to do these steps <I>before</I> compiling <B>MPlayer</B>,
-otherwise no 3Dfx support will be built. Also see the <A HREF="video.html#2.2.1.A.3">3dfx
+otherwise no 3Dfx support will be built. Also see the <A HREF="video.html#2.3.1.A.3">3dfx
 TV out section</A>.</LI>
 
-<LI>If you own an ATI card, see the <A HREF="video.html#2.2.1.A.2">2.2.1.A.2
-section</A> to know what features of your card is supported under Linux/MPlayer.</LI>
+<LI>If you own an ATI card, see the <A HREF="video.html#2.3.1.A.2">ATI cards
+section</A> of the TV-out documentation, to know what features of your card is supported under Linux/MPlayer.</LI>
 
 <LI>If you plan to use the ProjectMayo's <B>DivX4</B> codec, check the
-<A HREF="codecs.html#2.1.2.1">2.1.2.1</A> section before compiling.
+<A HREF="codecs.html#2.2.1.1">2.2.1.1</A> section before compiling.
 This codec can play old <B>DivX</B> movies much faster than the Win32 DLL.
 If you want to play movies with the new <B>DivX4</B> codec, it's
 <B>recommended</B> to use this library, instead the DivX.dll in the
 w32codecs.zip package. The codec itself is closed-source, and only an x86
-version is available.</LI>
+version is available. <I>You also need this codec for <B>MEncoder</B>, see
+below !</I></LI>
 
 <LI>If you plan to use ffmpeg's <B>libavcodec</B>, check the
-<A HREF="codecs.html#2.1.2.2">2.1.2.2</A> section before compiling.
+<A HREF="codecs.html#2.2.1.2">2.2.1.2</A> section before compiling.
 You'll need this to <B>gain <I>DivX/DivX4</I> playing on non-x86 machines</B>,
 and this codec has the <B>greatest decoding speed</B> for DivX and DivX4
 movies (even faster than the original DivX4 library itself) !</LI>
@@ -281,8 +307,11 @@ See <A HREF="cd-dvd.html#4.2">section 4.2</A> for more information.</LI>
 <LI>Decide if you need GUI. If you do, see the <A HREF=#1.4>1.4 section</A>
 before compiling.</LI>
 
-<LI>If you want to play <B>3ivx</B> movies, check the <A HREF=codecs.html#2.1.2.4>
-2.1.2.4 section</A>.</LI>
+<LI>If you want to install <B>MEncoder</B> (our great all-purpose encoder),
+see the <A HREF="encoding.html#2.4">MEncoder section</A> .</LI>
+
+<LI>If you want to play <B>3ivx</B> movies, check the <A HREF=codecs.html#2.2.1.3>
+XAnim codecs section</A>.</LI>
 </UL>
 
 <P>Then build <B>MPlayer</B>:</P>
@@ -291,7 +320,7 @@ before compiling.</LI>
     make
     make install</PRE>
 
-<P>It is recommended to browse the output of ./configure , it contains info
+<P><B><I>ALWAYS browse the output of ./configure</I></B> , it contains info
 about what will be built, and what won't. You may also want to view
 config.h and config.mak files.</P>
 
@@ -305,7 +334,9 @@ OSD, and subtitle functionality. Download mp-arial-iso-8859-*.zip and/or optiona
     unzip mp-arial-iso-8859-1.zip</PRE>
 
 <P>Only one thing remains: copy the <B>codecs.conf</B> file from the <CODE>etc</CODE>
-directory (relative to the <B>MPlayer</B> tree) to $HOME/.mplayer/codecs.conf.</P>
+directory (relative to the <B>MPlayer</B> tree) to <CODE>$HOME/.mplayer/codecs.conf</CODE> .
+You should also check the manpage and <CODE>example.conf</CODE> for available options, and insert them
+into your config file, <CODE>$HOME/.mplayer/config</CODE> .</P>
 
 
 <P><B><A NAME=1.4>1.4. What about the GUI?</A></B></P>
@@ -410,11 +441,21 @@ Now you have to see a timer at the upper left corner of the movie
 
 <P>You can change default behaviour by setting <CODE>osdlevel=</CODE> variable in config file.</P>
 
+
 <P><B><A NAME=2>2. Features</A></B></P>
 
-<P><A NAME=2.1>2.1. <A HREF="codecs.html">Video Formats, Audio & Video Codecs</A></P>
 
-<P><A NAME=2.2>2.2. <A HREF="video.html">Video</A> & <A HREF="sound.html">Audio</A> output devices</P>
+<P><A NAME=2.1>2.1. <A HREF="formats.html">Supported formats</A></P>
+
+
+<P><A NAME=2.2>2.2. <A HREF="codecs.html">Supported codecs</A></P>
+
+
+<P><A NAME=2.3>2.3. <A HREF="video.html">Video</A> & <A HREF="sound.html">Audio</A> output devices</P>
+
+
+<P><A NAME=2.4>2.4. <A HREF="encoding.html">MEncoder - An All-Purpose Encoder</P>
+
 
 <P><B><A NAME=3>3. Usage</A></B></P>
 
diff --git a/DOCS/encoding.html b/DOCS/encoding.html
index 5adb523bad..b2922c933e 100644
--- a/DOCS/encoding.html
+++ b/DOCS/encoding.html
@@ -3,7 +3,7 @@
 
 <FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>
 
-<P><B><A NAME=2.3>2.3.  Encoding with MEncoder</A></B></P>
+<P><B><A NAME=2.4>2.4.  Encoding with MEncoder</A></B></P>
 
 <P><B><I>Overview</I></B>
 <P><B>MEncoder</B> (<B>MPlayer</B>'s Movie Encoder) is a simple movie encoder,
diff --git a/DOCS/formats.html b/DOCS/formats.html
new file mode 100644
index 0000000000..ca15ae1f81
--- /dev/null
+++ b/DOCS/formats.html
@@ -0,0 +1,105 @@
+<HTML>
+<BODY BGCOLOR=WHITE>
+
+<FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>
+
+
+<P><B><A NAME=2.1>2.1. Supported formats</A></B></P>
+
+<P><B>MPlayer</B> can read/play from the following devices/formats:<BR>
+<UL>
+<LI> <A HREF="#2.1.1.1">VCD</A> (Video CD) directly from CD-ROM or from CDRwin's .bin image file     
+<LI> <A HREF="#2.1.1.1">DVD</A>, directly from your DVD disk, using libdvdread for decryption
+<LI> <A HREF="#2.1.1.1">MPEG 1/2</A> System Stream (PS/PES/VOB) and Elementary Stream (ES) file
+     formats
+<LI> <A HREF="#2.1.1.2">RIFF AVI</A> file format
+<LI> <A HREF="#2.1.1.3">ASF/WMV</A> 1.0 file format
+<LI> <A HREF="#2.1.1.4">QT/MOV</A> file format with (un)compressed headers
+<LI> <A HREF="#2.1.1.5">VIVO</A> format (.viv files)
+<LI> supports <A HREF="documentation.html#3.3">reading from file</A>, stdin, or network via HTTP
+</UL></P>
+
+<P>Note: about realmedia (.ra/.rm) support read the FAQ!</P>
+
+<P>It's important to clarify a popular mistake. When people see a file with
+<B>.AVI</B> extension, they instantly declare that isn't an MPEG file.
+That's not true. At least not entirely. If you tell them that such a file
+can contain MPEG1 video, they laugh at you. Feel free to kick their dumbass
+faces, then tell them to RTFM.</P>
+
+<P>You see, a <B>codec</B> isn't equal to a <B>file format</B>.<BR>
+Video <B>codecs</B> are: MPEG1, MPEG2, DivX, Indeo5, 3ivx.<BR>
+Video <B>formats</B> are: MPG, VOB, AVI, ASF.<BR>
+</P>
+
+<P>In theory, you can happily put an OpenDivX video and MP3 audio
+into a <B>.MPG</B> format file. Though most players won't play it, since
+they expect MPEG1 video and MP2 audio (<B>.MPG</B> doesn't have the
+necessary fields to describe its video and audio streams, like <B>.AVI</B>
+does). Or put MPEG1 video to an .AVI. For example <A HREF="http://ffmpeg.sourceforge.net">ffmpeg</A> can
+create these files.</P>
+
+<P>Audio <B>codecs</B> and <B>formats</B> are basically the same terms.</P>
+
+
+<P><B><A NAME=2.1.1>2.1.1. Video formats</A></B></P>
+
+
+<P><B><A NAME=2.1.1.1>2.1.1.1. MPG, VOB, DAT files</A></B></P>
+
+<P>
+<LI>MPG : this is the most <B>basic</B> form of MPEG file formats. Contains
+MPEG1 video, and MP2 audio.</LI>
+<LI>VOB : this is the MPEG file format on <B>DVD</B>s. Contains optionally
+encoded MPEG2 video, and usually AC3 audio.<BR>
+<B>Read the <A HREF="cd-dvd.html#4.2">DVD section</A> !</B></LI>
+<LI>DAT : this is the MPEG file format on <B>Video CD</B>s. It's the same
+as the MPG, but due to the nature VCDs are created and Linux is designed,
+the DAT files can't be played nor copied from VCDs. You have to use the
+<CODE>-vcd</CODE> option to play the VideoCD.</LI>
+</P>
+
+
+<P><B><A NAME=2.1.1.2>2.1.1.2. AVI files</A></B></P>
+
+<P>Designed by Micro$oft, the <B>AVI (Audio Video Interleaved)</B> is a
+widespread multipurpose format, currently used mostly for DivX and DivX4
+videos. Has many known drawbacks, and inabilities (for example in streaming).
+Has support for one video stream, and 99 audio streams. Can be as big as
+2Gb. There exists an extension for it to be bigger, called <B>OpenDMS</B>.
+M$ is currently strongly discourages its use and propagates ASF/WMV. Not if
+anybody cares.<BR>
+<B>NOTE</B> : DV cameras can create two types of AVI format, one is the usual and
+playable, the other is neither.</P>
+
+
+<P><B><A NAME=2.1.1.3>2.1.1.3. ASF/WMV files</A></B></P>
+
+<P>ASF is a new very undocumented fileformat from M$, and WMV is its
+successor. They are very commercial, and anyone who writes an opensource
+parser for them, soon meets certain doom. While creating the parser, it
+was obvious to see how bulky, shit, and unusable they are. Not if anybody
+would expect something else from M$.
+
+
+<P><B><A NAME=2.1.1.4>2.1.1.4. QT/MOV files</A></B></P>
+
+<P>They are Apple's formats. Not much to say, basically well designed,
+multipurpose, streamable, many features etc. Kinda hard to find documentation,
+but we think the parser is perfect.
+
+<P><B><A NAME=2.1.1.5>2.1.1.5. VIV files</A></B></P>
+
+<P>Hey this is new code in <B>MPlayer</B>, be gentle! Seeking is
+currently nonexistent, audio too. TODO : complete this section.</P>
+
+
+<P><B><A NAME=2.1.2>2.1.2. Audio formats</A></B></P>
+
+<P>Currently <B>MPlayer</B> is still a <B>Movie</B> and not a <B>Media</B>
+player, thus the pure audio formats (for example MP3, WAV, audio ASF) are
+unplayable. Use <A HREF="http://www.xmms.org">xmms</A>, <A HREF="http://www.mpg123.de">mpg123</A>
+or whatever.</P>
+
+</BODY>
+</HTML>
diff --git a/DOCS/sound.html b/DOCS/sound.html
index 616c6d768b..257f105381 100644
--- a/DOCS/sound.html
+++ b/DOCS/sound.html
@@ -3,7 +3,7 @@
 
 <FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>
 
-<P><B><A NAME=2.2.2>2.2.2. Audio output devices</A></P></B>
+<P><B><A NAME=2.3.2>2.3.2. Audio output devices</A></P></B>
 
 <P><B>MPlayer</B>'s audio interface is called <I>libao2</I>. It currently
 contains these drivers :</P>
@@ -42,7 +42,7 @@ problems (losing sync, disappearing audio, etc).</LI>
 <P>On <B>Solaris/FreeBSD</B> systems, use the SUN audio driver with the
 <I>-ao sun</I> option, otherwise you'll have no video, nor audio playing.</P>
 
-<P><B><A NAME=2.2.2.1>2.2.2.1. Soundcard experiences, recommendations</A></B></P>
+<P><B><A NAME=2.3.2.1>2.3.2.1. Soundcard experiences, recommendations</A></B></P>
 
 <P><TABLE BORDER=0 WIDTH=100%>
 <TD COLSPAN=3><B><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>Aureal Vortex 2</B></TD><TR>
diff --git a/DOCS/video.html b/DOCS/video.html
index 941548cdc8..10447009e1 100644
--- a/DOCS/video.html
+++ b/DOCS/video.html
@@ -3,7 +3,7 @@
 
 <FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>
 
-<P><B><A NAME=2.2.1>2.2.1. Video output devices</A></B></P>
+<P><B><A NAME=2.3.1>2.3.1. Video output devices</A></B></P>
 
 <TABLE BORDER=0>
 
@@ -24,7 +24,7 @@
 &nbsp;&nbsp;<CODE>1.2.0:</CODE> supports AAlib (-vo aa is very recommended, see below!)</TD><TR>
 <TD></TD><TD VALIGN=top><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>ggi</TD><TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>similar to SDL</TD><TR>
 <TD></TD><TD VALIGN=top><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>aa</TD><TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>textmode rendering with AAlib</TD><TR>
-<TD></TD><TD VALIGN=top><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2><a href="video.html#2.2.1.12">vesa</a></TD><TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>Output to VESA BIOS.</TD><TR>
+<TD></TD><TD VALIGN=top><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2><a href="video.html#2.3.1.12">vesa</a></TD><TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>Output to VESA BIOS.</TD><TR>
 
 <TD COLSPAN=4><P><B><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>Card specific:</B></P></TD><TR>
 
@@ -48,7 +48,7 @@ broken)</TD><TR>
 <P>NOTE: <I>check the following subsections for details and requirements!</I></P>
 
 
-<P><B><A NAME=2.2.1.1>2.2.1.1. MTRR</A></B></P>
+<P><B><A NAME=2.3.1.1>2.3.1.1.  Setting up MTRR</A></B></P>
 
 <P>It is VERY recommended to check if the MTRR registers are set up properly,
 because they can give a big performance boost.</P>
@@ -106,7 +106,7 @@ ram (size=0x2000000) just execute:</P>
 stepping 0] doesn't support MTRR, but stepping 12's do ('<CODE>cat /proc/cpuinfo</CODE>'
 to check it</CODE>').</P>
 
-<P><B><A NAME=2.2.1.2>2.2.1.2. Xv</A></B></P>
+<P><B><A NAME=2.3.1.2>2.3.1.2. Xv</A></B></P>
 
 <P>Under XFree86 4.0.2 or newer, you can use your card's hardware YUV routines
 using the XVideo extension. This is what the option '-vo xv' uses.
@@ -159,24 +159,24 @@ usable with <B>MPlayer</B>.</P>
 
 </UL></P>
 
-<P><B><A NAME=2.2.1.2.1>2.2.1.2.1. 3dfx cards</A></B></P>
+<P><B><A NAME=2.3.1.2.1>2.3.1.2.1. 3dfx cards</A></B></P>
 
 <P>Older 3dfx drivers were known to have problems with XVideo acceleration,
 it didn't support either YUY2 or YV12, and so. Verify that you have
 XFree86 version 4.1.0 or greater, it works ok. Alternatively, you can use
 <A HREF="http://dri.sourceforge.net">DRI</A> cvs.
 If you experience strange effects using -vo xv, try SDL (it has XVideo too)
-and see if it helps. Check the <A HREF="#2.2.1.4">SDL section</A> for details.</P>
+and see if it helps. Check the <A HREF="#2.3.1.4">SDL section</A> for details.</P>
 
-<P><B>OR</B>, try the NEW -vo tdfxfb driver! See the <A HREF=#2.2.1.9>2.2.1.9</A>
+<P><B>OR</B>, try the NEW -vo tdfxfb driver! See the <A HREF=#2.3.1.9>2.3.1.9</A>
 section!</P>
 
-<P><B><A NAME=2.2.1.2.2>2.2.1.2.2. S3 cards</A></B></P>
+<P><B><A NAME=2.3.1.2.2>2.3.1.2.2. S3 cards</A></B></P>