small updates here-and-there

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

3 files changed, 67 insertions, 50 deletions

diff --git a/DOCS/en/codecs.html b/DOCS/en/codecs.html
index 3a2b883de9..551e9e0217 100644
--- a/DOCS/en/codecs.html
+++ b/DOCS/en/codecs.html
@@ -30,7 +30,7 @@
     Win32 DLL decoder for <B>Windows Media Video 9</B> (<B>WMV3</B>), both
     used in .wmv files</LI>
   <LI>native <B>Sorenson 1 (SVQ1)</B> decoder</LI>
-  <LI>Win32/QT <B>Sorenson 3 (SVQ3)</B> decoder</LI>
+  <LI>native <B>Sorenson 3 (SVQ3)</B> decoder</LI>
   <LI><B>3ivx</B> v1, v2 decoder</LI>
   <LI>Cinepak and <B>Intel Indeo</B> codecs (3.1, 3.2, 4.1, 5.0)</LI>
   <LI><B>MJPEG</B>, AVID, VCR2, ASV2 and other hardware formats</LI>
@@ -134,16 +134,21 @@
 <P><A HREF="http://ffmpeg.sourceforge.net">FFmpeg</A> contains an
   <B>open source</B> codec package, which is capable of decoding streams
   encoded with
-  H263/MJPEG/RV10/DivX3/DivX4/DivX5/MP41/MP42/WMV1/WMV2/HuffYUV
+  H263/MJPEG/RV10/DivX3/DivX4/DivX5/MP41/MP42/WMV1/WMV2/HuffYUV/SVQ1/SVQ3
   video, or WMA (Windows Media Audio) audio codecs. Not only some of
   them can be encoded with, but it also offers higher speed than the Win32
   codecs or the DivX.com DivX4/5 library!</P>
 
 <P>It contains a lot of nice codecs, especially important are the MPEG4
   variants:
-  DivX3, DivX4, DivX5, Windows Media Video 7 (WMV1). Also a very
+  DivX3, DivX4, DivX5, Windows Media Video 7/8 (WMV1/WMV2). Also a very
   interesting one is the WMA decoder.</P>
 
+<P>The most recent codec deserving credit is the <B>Sorenson 3</B> (SVQ3)
+  codec. This is the first, completely opensource implementation of this
+  codec. It's even faster than the original. Be sure to prefer this instead
+  of the binary codec!</P>
+
 <P>If you use an MPlayer release you have libavcodec right in the
   package, just build as usual. If you use MPlayer from CVS you have to
   extract libavcodec from the FFmpeg CVS tree as FFmpeg releases <B>don't</B>
@@ -322,10 +327,9 @@ MPlayer supports decoding all versions of RealVideo:
     MPlayer, the other is in libavcodec. You can invoke each of them with the
     <CODE>-vc svq1</CODE> and <CODE>-vc ffsvq1</CODE> options respectively.
     Some files may work with one of them, and not with the other, so test
-    both decoders. The decoder was written (reverse engineered) by the
-    <A HREF="http://www.xinehq.de">xine</A> authors.</LI>
-  <LI>Sorenson 3 (fourcc <I>SVQ3</I>) - decoding supported by <B>Win32
-    QuickTime libraries</B></LI>
+    both decoders.</LI>
+  <LI>Sorenson 3 (fourcc <I>SVQ3</I>) - decoding supported by <B>native
+    codec</B> (<A HREF="#libavcodec">libavcodec</A>)</LI>
 </UL>
 
 <H4>COMPILING MPLAYER WITH QUICKTIME LIBRARIES SUPPORT</H4>
diff --git a/DOCS/en/documentation.html b/DOCS/en/documentation.html
index f92c52f1b7..0bad5d96b2 100644
--- a/DOCS/en/documentation.html
+++ b/DOCS/en/documentation.html
@@ -352,8 +352,8 @@
   through the files.</P>
 
 <P>The main rule of this documentation: if it's not documented, it
-  <U>does not exist</U>. If I don't say you encode audio from TV tuner, you
-  can't. A healthy quantity of combining ability is welcomed, though.
+  <U>does not exist</U>. If I don't say you can encode audio from TV tuner, you
+  can't (you can!:). A healthy quantity of combining ability is welcomed, though.
   Good luck. You'll need it :) And for another good advice, let me quote
   Chris Phillips from the
   <A HREF="http://mplayerhq.hu/pipermail/mplayer-users/">mplayer-users</A>
@@ -380,10 +380,10 @@
 <P>MPlayer is a movie player for LINUX (runs on many other Unices, and
   <B>non-x86</B> CPUs, see the <A HREF="#ports">ports section</A>). It plays most
   MPEG, VOB, AVI, OGG/OGM, VIVO, ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg,
-  FILM, RoQ, PVA files, supported by many native, XAnim, RealPlayer, and
+  FILM, RoQ, PVA, Matroska files, supported by many native, XAnim, RealPlayer, and
   Win32 DLL codecs. You can watch <B>VideoCD</B>, <B>SVCD</B>, <B>DVD</B>,
-  <B>3ivx</B>, <B>RealMedia</B>, and <B>DivX</B> movies too (and you don't need
-  the avifile
+  <B>3ivx</B>, <B>RealMedia</B>, <B>Sorenson</B>, <B>Theora</B> and <B>DivX</B>
+  movies too (and you don't need the avifile
   library at all!). Another big feature of MPlayer is the wide range of
   supported output drivers. It works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev,
   AAlib, DirectFB, but you can also use GGI and SDL (and this way all their
@@ -501,7 +501,12 @@
     Again not a release, but after adding Sorenson 3 (QuickTime) and Windows
     Media 9 support, MPlayer is the world's first movie player with support
     for all known video formats!</LI>
-  <LI><B>MPlayer 0.90 "?"</B> Date yet unknown</LI>
+  <LI><B>MPlayer 0.90 "The CounterCounter"</B> Apr 6, 2003<BR>
+    After more than 1 year, we finally concluded that the code was indeed
+    stable again, and ready to be published as a release. Unfortunately we
+    forgot even to increase the version number, and other annoying bugs went
+    in, so get ready for...</LI>
+  <LI><B>MPlayer 0.91 "?"</B> date yet unknown</LI>
 </UL>
 
 
@@ -521,19 +526,19 @@
 <UL>
   <LI><B>binutils</B> - suggested version is <B>2.11.x</B> . This program is
     responsible for generating MMX/3DNow!/etc instructions, thus very important.</LI>
-  <LI><B>gcc</B> - suggested versions are: <B>2.95.3</B> (maybe <B>2.95.4</B>) and <B>3.2+</B>.
+  <LI><B>gcc</B> - suggested versions are: <B>2.95.3</B> (maybe <B>2.95.4</B>) and <B>3.3+</B>.
     <B>NEVER</B> use 2.96 or 3.0.x! They generate faulty code for MPlayer.
-    If you decide to change gcc from 2.96, then don't decide in favor of 3.0.x
-    just because it's newer! Early releases of 3.0.x were even more buggy than
+    If you decide to change gcc from 2.96, then don't decide in favor of 3.x
+    just because it's newer! Early releases of 3.x were even more buggy than
     2.96. So downgrade to 2.95.x (downgrade libstdc++ too, other programs may
     need it) or don't up/downgrade at all (but in this case, be prepared for
-    runtime problems). If you vote for 3.x.x, try to use the latest version,
-    early releases had various bugs, so be sure you use at least 3.1, it's
+    runtime problems). If you vote for 3.x, try to use the latest version,
+    early releases had various bugs, so be sure you use at least 3.3, it's
     tested and working. For detailed information about gcc 2.96's bugs (that are
     still NOT fixed, they have been WORKED AROUND in MPlayer!), see the
     <A HREF="users_against_developers.html#gcc">gcc 2.96</A> section and the
     <A HREF="faq.html">FAQ</A>.</LI>
-  <LI><B>XFree86</B> - suggested version is <B>always the newest (4.2.1)</B>.
+  <LI><B>XFree86</B> - suggested version is <B>always the newest (4.3)</B>.
     Normally, everyone wants this, as starting with XFree86 4.0.2, it contains
     the <A HREF="video.html#xv">XVideo</A> extension (somewhere referred to
     as <B>Xv</B>) which is needed to enable the hardware YUV acceleration (fast
@@ -563,14 +568,15 @@
     required.</LI>
   <LI><B>libxmms</B> - optional, for XMMS input plugin support. At least 1.2.7 is
     required.</LI>
+  <LI><B>libsmb</B> - optional, for Samba support.</LI>
 </UL>
 
 <H4>Codecs:</H4>
 
 <UL>
   <LI><B>libavcodec</B>: This codec package is capable of decoding
-    H263/MJPEG/RV10/DivX3/DivX4/DivX5/MP41/MP42/WMV1 encoded video streams and
-    WMA (Windows Media Audio) v1/v2 audio streams, on
+    H263/MJPEG/RV10/DivX3/DivX4/DivX5/MP41/MP42/WMV1/WMV2/SVQ1/SVQ3 encoded
+    video streams and WMA (Windows Media Audio) v1/v2 audio streams, on
     multiple platforms. It is also known to be the fastest for this task.
     See the <A HREF="codecs.html#libavcodec">libavcodec</A> section for details.
     Features:<BR>
@@ -593,7 +599,7 @@
       <LI>you need this if you want to play or encode for example movies recorded
         with various hardware compressors, like tuner cards, digital cameras
         (example: DV, ATI VCR, MJPEG)</LI>
-      <LI>needed if you want to play <B>WMV8, WMV9/WMA9 movies</B>.</LI>
+      <LI>needed if you want to play <B>WMV9/WMA9 movies</B>.</LI>
       <LI>Not needed for old
         ASF's with MP41 or MP42 video (though VoxWare audio is frequent for these
         files - it's done by the Win32 codec), or WMV7. Also not needed
@@ -601,9 +607,9 @@
         for that.</LI>
     </UL>
   </LI>
-  <LI><B>QuickTime codecs</B>: on x86 platforms these codecs can be used
-    to decode Sorenson v1/v3, RPZA, and other QuickTime video, and
-    QDesign audio streams. Installation instructions can be found in the
+  <LI><B>QuickTime codecs</B>: on x86 platforms these codecs are needed
+    to decode RPZA, and other QuickTime video, and QDesign audio streams.
+    Installation instructions can be found in the
     <A HREF="codecs.html#sorenson">Sorenson video codec</A> section.</LI>
   <LI><B>DivX4/DivX5</B>: information about this codec is available in the
     <A HREF="codecs.html#divx">DivX4/DivX5</A> section. You possibly don't want
@@ -802,8 +808,8 @@
 <P>At this point, MPlayer is ready to use. The directory
   <CODE>$PREFIX/etc/mplayer</CODE> contains the <CODE>codecs.conf</CODE>
   file, which is used to tell the program all the codecs and their
-  capabilities.  This file should always be kept up to date together with the
-  main binary.<BR>
+  capabilities. This file is needed only when you want to change its
+  properties, as the main binary contains an internal copy of it.<BR>
   Check if you have <CODE>codecs.conf</CODE> in your home directory
   (<CODE>~/.mplayer/codecs.conf</CODE>) left from old MPlayer versions, and remove it.</P>
 
@@ -886,6 +892,9 @@
   <LI>Sami: <CODE>-dumpsami</CODE></LI>
 </UL>
 
+<P>MEncoder can dump DVD subtitles into
+  <A HREF="encoding.html#vobsub">VobSub</A> format.</P>
+
 <P>The command line options differ slightly for the different formats:</P>
 
 <H4>VobSub subtitles</H4>
@@ -948,7 +957,9 @@
   (from
   <A HREF="../tech/mpsub.sub">DOCS/tech/mpsub.sub</A>):</P>
 
-<P><CODE><I># first number  : wait this much after previous subtitle disappeared<BR>
+<P><CODE><I>
+  FORMAT=TIME<BR>
+  # first number  : wait this much after previous subtitle disappeared<BR>
   # second number : display the current subtitle for this many seconds<BR>
   <BR>
   15 3<BR>
@@ -978,6 +989,15 @@
   There are many ways to get it:</P>
 
 <UL>
+  <LI>using a TrueType (TTF) font, by the means of the <B>freetype</B>
+    library. Version 2.0.9 or greater is mandatory! Then you
+    have two methods:
+    <UL>
+      <LI>use the <CODE>-font /path/to/arial.ttf</CODE> option to specify
+        a TrueType font file on every occasion</LI>
+      <LI>create a symlink: <CODE>ln -s /path/to/arial.ttf ~/.mplayer/subfont.ttf</CODE></LI>
+    </UL>
+  </LI>
   <LI>download ready-to-use font packages from MPlayer site.
     Note: Currently available fonts are limited for iso 8859-1/2 support,
     but there are some other (including Korean, Russian, 8859-8 etc) fonts
@@ -1002,15 +1022,6 @@
     (read TOOLS/subfont-c/README for details)</LI>
   <LI>use the font generator GIMP plugin at TOOLS/subfont-GIMP
     (note: you must have HSI RAW plugin too, see URL below)</LI>
-  <LI>using a TrueType (TTF) font, by the means of the <B>freetype</B>
-    library. Version 2.0.9 or greater is mandatory! Then you
-    have two methods:
-    <UL>
-      <LI>use the <CODE>-font /path/to/arial.ttf</CODE> option to specify
-        a TrueType font file on every occasion</LI>
-      <LI>create a symlink: <CODE>ln -s /path/to/arial.ttf ~/.mplayer/subfont.ttf</CODE></LI>
-    </UL>
-  </LI>
 </UL>
 
 <P>If you chose non-TTF fonts, UNZIP the file you downloaded to <CODE>~/.mplayer</CODE> or
diff --git a/DOCS/en/video.html b/DOCS/en/video.html
index 3b19b9d607..b3c7606594 100644
--- a/DOCS/en/video.html
+++ b/DOCS/en/video.html
@@ -179,25 +179,25 @@
     default. It means that decoding speed (!) is synced to the monitor's
     refresh rate. If playing seems to be slow, try disabling VSYNC somehow, or
     set refresh rate to n*(fps of the movie) Hz.</LI>
-  <LI>Radeon VE - currently only XFree86 CVS has driver for this card, version
-    4.1.0 doesn't. And no TV out support. Of course with MPlayer you can
-    happily get <B>accelerated</B> display, with or without <B>TV output</B>, and
+  <LI>Radeon VE - if you need X, use XFree86 4.2.0 or greater for this card.
+    No TV out support. Of course with MPlayer you can happily get
+    <B>accelerated</B> display, with or without <B>TV output</B>, and
     no libraries or X are needed. Read <A HREF="#vidix">VIDIX</A> section.</LI>
 </UL>
 
 
 <H4><A NAME="xv_neomagic">2.3.1.2.1.5 NeoMagic cards</A></H4>
 
-<P>These cards can be found in many laptops. Unfortunately, the driver in
-  XFree prior to 4.3.0 cannot do Xv, but Stefan Seyfried provided 
+<P>These cards can be found in many laptops. You must use XFree86 4.3.0 or
+  above, or else use Stefan Seyfried's
   <A HREF="http://www.mplayerhq.hu/MPlayer/contrib/NeoMagic-driver/">Xv-capable drivers</A>.
-  Just choose the one that applies to your version of Xfree.</P>
+  Just choose the one that applies to your version of XFree86.</P>
 
 <P>XFree86 4.3.0 includes Xv support, yet Bohdan Horst sent a small
   <A HREF="http://www.mplayerhq.hu/MPlayer/contrib/NeoMagic-driver/neo_driver.patch">patch</A>
-  against the XFree86 sources that speeds up framebuffer operations up to four
-  times. The patch has been included in XFree86 CVS and should be in the next
-  release after 4.3.0.</P>
+  against the XFree86 sources that speeds up framebuffer operations (so XVideo)
+  up to four times. The patch has been included in XFree86 CVS and should be in
+  the next release after 4.3.0.</P>
 
 <P>To allow playback of DVD sized content change your XF86Config like this:</P>
 
@@ -559,8 +559,8 @@
     supported only if the movie's pixel format matches the video mode's pixel
     format. Pay attention to the bpp value, fbdev driver tries to use the
     current, or if you specify the -bpp option, then that.</LI>
-  <LI><B>-zoom</B> option isn't supported (software scaling is slow). -fs
-    option isn't supported. You can't use 8bpp (or less) modes.</LI>
+  <LI><B>-zoom</B> option isn't supported (use <CODE>-vf scale</CODE>).
+    You can't use 8bpp (or less) modes.</LI>
   <LI>you possibly want to turn the cursor off: <CODE>echo -e
     '\033[?25l'</CODE> or <CODE>setterm -cursor off</CODE><BR>
     and the screen saver: <CODE>setterm -blank 0</CODE><BR>
@@ -999,8 +999,10 @@ Indeed it doesn't matter which video output driver is used with <B>VIDIX</B>.
   or directly on Ville Syrjala's
   <A HREF="http://www.sci.fi/~syrjala/directfb/Matrox_TV-out_README.txt">home page</A>.</P>
 
-<P>Note: we haven't been able to make this work, but others did. Anyway,
-  porting of the CRTC2 code to <B>mga_vid</B> is underway.</P>
+<P>Note: the first DirectFB version with which we could kick this working was
+  0.9.17 (it's buggy, needs that <CODE>surfacemanager</CODE> patch from
+  the URL above). Anyway, porting of the CRTC2 code to <B>mga_vid</B> is
+  underway.</P>
 
 
 <H4><A NAME="mpegdec">2.3.1.3 MPEG decoders</A></H4>