some fixes, updates

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

10 files changed, 207 insertions, 99 deletions

diff --git a/DOCS/AUTHORS b/DOCS/AUTHORS
index b093f7b956..08c98b4153 100644
--- a/DOCS/AUTHORS
+++ b/DOCS/AUTHORS
@@ -1,11 +1,11 @@
-                            AUTHORS:
-                            ~~~~~~~~
+                                 AUTHORS:
+                                 ~~~~~~~~
 
-====================== The MPlayer project: ===========================
-
-NOTE: Do NOT send bugreports, help & feature requests directly to the authors!
+NOTE: Do *NOT* send bugreports, help & feature requests directly to the authors!
 ===== Read DOCS/BUGREPORTS and subscribe to mplayer-users mailing lists.
 
+========================== The MPlayer project: ===============================
+
 Árpád Gereöffy (A'rpi/ESP-team):  <arpi@thot.banki.hu>
 - player code (mpeg stream demultiplexer and avi/asf parser, A-V sync, seek...)
 - mp3lib, based on mpglib sources  [MP3 audio decoder]
@@ -43,10 +43,10 @@ Gábor Bérczi (Gabucino):  <gabucino@k2.jozsef.kando.hu>
 - IRC channel #MPlayer operator
 - experimental MINIX port
 
-Szabolcs Berecz: <szabi@inf.elte.hu>
+Szabolcs Berecz (Szabi): <szabi@inf.elte.hu>
 - codecs.conf file parser
 - config file and command line parser
-- mga_vid fixes, module option stc.
+- mga_vid fixes, module option etc.
 - fbdev support in libvo
 - type #7 subtitle support
 
@@ -62,21 +62,21 @@ Zoltán Márk Vicián (Se7en): <se7en@sch.bme.hu>
 - SVGAlib support in libvo
 - native AAlib driver (coming soon)
 
-Alex Beregszaszi (Alex): <alex@naxine.org>
-- ALSA output driver in libao
+Alex Beregszaszi (Al3x): <alex@naxine.org>
+- ALSA output driver in libao2
 - vo_ggi output driver in libvo (www.ggi-project.org)
 
-Andreas Ackermann:  <asackerm@stud.informatik.uni-erlangen.de>
+Andreas Ackermann (Acki):  <asackerm@stud.informatik.uni-erlangen.de>
 - LIRC support (see DOCS/LIRC)
 - DGA support in libvo
 
-Felix Bünemann: <atmosfear@users.sourceforge.net>
+Felix Bünemann (Atmos): <atmosfear@users.sourceforge.net>
 - SDL driver maintainer
 - Additional YUV formats fixes
 - New font (mp_font2.zip)
 - PNG file output support in libvo
 - flipping support (for Indeo 3/4, etc)
-- SDL audio driver
+- SDL audio driver in libao2
 - RAW PCM/WAVE file writer for libao2
 
 TeLeNiEkO: <telenieko@telenieko.com>
@@ -100,7 +100,7 @@ German Gomez Garcia: <german@piraos.com>
 - DVD .ifo parser and chapter selection [not yet in the main trunk]
 - SPDIF AC3 output for SBLive!  [not yet in the main trunk]
 
-Dariush Pietrzak: <eyck@incubus.ar.lublin.pl>
+Dariush Pietrzak (Eyck): <eyck@incubus.ar.lublin.pl>
 - debian packaging support (see debian/* and DOCS/DEBIAN)
 - support for vplayer subtitle format
 - prelimenary support for .RT subtitle format
@@ -108,10 +108,14 @@ Dariush Pietrzak: <eyck@incubus.ar.lublin.pl>
 Jürgen Keil and Marcus Comstedt: <jk@tools.de> <marcus@idonex.se>
 - patched MPlayer to work on Solaris 8 x86
 - configure fixes
+- SUN audio driver in libao2
 
 Vladimir Kushnir: <vkushnir@Alfacom.net>
 - patched MPlayer to work on FreeBSD x86
 
+Bertrand BAUDET: <bertrand_baudet@yahoo.com>
+- network streaming support
+
 Main testers:
   Tibor Balázs (Tibcu)
   Péter Sasi (SaPe)
@@ -144,7 +148,6 @@ Michael Hipp:
 - mpglib author   [isn't used directly but in mp3lib]
 
 Mark Podlipec:
-- xanim author    [I'm using its aLaw+uLaw audio decoder]
 - xa_gsm.c author  [MS-GSM audio codec]
                    [from a GSM library by Jutta Degener and Carsten Bormann]
 
diff --git a/DOCS/BUGREPORTS b/DOCS/BUGREPORTS
index 806905f0a0..0a85aca614 100644
--- a/DOCS/BUGREPORTS
+++ b/DOCS/BUGREPORTS
@@ -25,7 +25,9 @@ What?
 
 1. The system info what we always want:
 - linux distribution
-  for example: RedHat 7.1 / Slackware 7.0 + devel packs from 7.1 ...
+  examples: 
+    RedHat 7.1
+    Slackware 7.0 + devel packs from 7.1 ...
 - kernel version:
   uname -a
 - libc version:
@@ -38,24 +40,6 @@ What?
 - binutils version:
   as --version
 
-1.1. Please print us coredump (if it was created).
-Howto:
-please create following command file:
-
-disass $eip $eip+15
-printf "eax=%08lX\n",$eax
-printf "ebx=%08lX\n",$ebx
-printf "ecx=%08lX\n",$ecx
-printf "edx=%08lX\n",$edx
-printf "esp=%08lX\n",$esp
-printf "ebp=%08lX\n",$ebp
-printf "edi=%08lX\n",$edi
-printf "esi=%08lX\n",$esi
-
-Then simply execute following command line:
-gdb mplayer --core=core -batch --command=command_file >mplayer.bug
-
-
 2. Hardware & drivers:
 - CPU info:
   cat /proc/cpuinfo
@@ -105,8 +89,40 @@ For playback problems:
   the path/filename of the file on the FTP.
   If the file is accessible on the net, then sending the
   _exact_ URL is enough!
-  
+
+5. For crashes (segfault, SIGILL, signal 4 etc):
+
+If you have coredump of the crash, see 5.a, else see 5.b:
+
+5.a: Please print us coredump (if it was created).
+Howto:
+please create following command file:
+
+disass $eip-32 $eip+32
+printf "eax=%08lX\n",$eax
+printf "ebx=%08lX\n",$ebx
+printf "ecx=%08lX\n",$ecx
+printf "edx=%08lX\n",$edx
+printf "esp=%08lX\n",$esp
+printf "ebp=%08lX\n",$ebp
+printf "edi=%08lX\n",$edi
+printf "esi=%08lX\n",$esi
+
+Then simply execute following command line:
+gdb mplayer --core=core -batch --command=command_file >mplayer.bug
+
+5.b.: run MPlayer in gdb:
+[at root/user shell prompt:]
+  # gdb mplayer
+[at gdb prompt:]
+  > run -v [options-to-mplayer] filename
+  ... (wait until it will crash)
+  > bt
+  > disass $eip-32 $eip+32
+Send us the full output of the above things!
+
 In general:
+~~~~~~~~~~~
   If something is big (logs etc) then it's better to upload to the ftp
   (gzipped), and include only path/filename in the bugreport!
 
diff --git a/DOCS/BUGS b/DOCS/BUGS
index d18e40b5b6..2efc6ffcfc 100644
--- a/DOCS/BUGS
+++ b/DOCS/BUGS
@@ -8,32 +8,33 @@ Special system/cpu-specific bugs/problems:
   Workaround:  ./configure --disable-fastmemcpy
   SOLVED: disabled SSE code in fastmemcpy.h ;(
 
-2. No image (black image) in RGB 16bpp (x11,dga,fbdev,svga) playing
-  MPEG files on SMP machine:
-  Problem: bug(?) in MMX YV12->RGB16 converter code
-  Workaround: ./configure --disable-mmx
-  SOLVED: bug of gcc-2.96  -  you should use 2.95.2 or 2.95.3
+2. No image (black image) in RGB 15/16bpp (x11,dga,fbdev,svga) playing
+  MPEG or OpenDivX files:
+  Problem: gcc 2.96 bug
+  Workaround: ./configure --disable-mmx, or use gcc 2.95.x
+  SOLVED: code fixed
 
 3. SIGILL (signal 4) or other fault at loading l3codeca.acm:
   Problem: shared libs are loaded to 0x00xxxxxx instead of 0x40xxxxxx
   Workaround: mplayer -afm 1 ...
   SOLVED: you are using some security kernel patch, like OpenWall etc.
 
-4. General SIGILL (signal 4):
+4. SIGILL (signal 4) on P3 using 2.2.x kernels:
+  Problem: kernel 2.2.x doesn't have proper (working) SSE support
+  Solution: upgrade kernel to 2.4.x
+  Workaround: ./configure --disable-sse
+
+5. General SIGILL (signal 4):
   Problem: you compiled and run mplayer in different machines
-    (for example compiled on P3 and runinng on celeron)
-  Solution: compile MPlayer on machine where you will use it
+    (for example compiled on P3 and running on celeron)
+  Solution: compile MPlayer on the same machine where you will use it!
   Workaround: ./configure --disable-sse etc. options
 
 Various A-V sync and other audio problems:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 General audio delay or jerky sound (exists with all or many files):
-- bad select() in audio driver (including ALSA's OSS emulation)
-  Workaround: ./configure --disable-select
-  SOLVED: using ioctls instead of select in the new audio code
-- audio buffer problems
+- audio buffer problems (buffer size badly detected)
   Workaround:  mplayer -abs option
-  SOLVED: using ioctls in the new audio code
 - slow machine (cpu or vga)
   try with -vo null, if it plays well, then you have slow VGA card/driver:
   Workaround: buy a faster card or read DOCS/VIDEOCARDS about how to speed up
@@ -47,11 +48,15 @@ Audio delay/de-sync specific to one or a few files:
 - your soundcard doesn't support 48Khz playback
   Workaround: buy a better soundcard... 
               or try to decrease fps by 10% (use -fps 27 for a 30fps movie)
+- slow machine
+  (if A-V is not around 0, and teh last number in the status line increasing)
+  Workaround: -framedrop
 
 After many > or ^ (fast forward) audio vs. video is going out of sync (ASF/AVI)
 - bug in mplayer code (a-v sync probs after seek... not really bug but
   my avi/asf seeking code is not perfect yet)
   Workaround: -bps
+  SOLVED: code fixed (but -bps still can help)
 
 Signal 11 in decode_audio:
 - mp3lib doesn't handle (yet) well bad/broken audio streams
@@ -69,7 +74,9 @@ First note: options -fs -vm and -zoom are just recommendations, not (yet)
 supported by all drivers. So it isn't a bug if it doesn't work.
 Only a few driver supports scaling/zooming, don't expect this from x11 or dga.
 
-[TODO: known libvo bugs]
+OSD/sub flickering:
+- x11 driver: sorry, it can't be fixed now
+- xv driver: increase number of buffers in libvo/vo_xv.c, and recompile all
 
 
 A'rpi / Astral & ESP-team
diff --git a/DOCS/ChangeLog b/DOCS/ChangeLog
index 0d677822ad..f400a07172 100644
--- a/DOCS/ChangeLog
+++ b/DOCS/ChangeLog
@@ -2,6 +2,10 @@
 ChangeLog:
 ~~~~~~~~~~
 
+v0.18 "BugCounter" :
+  - all known bugs fixed
+  - thousands of changes, updates, code cleanups, features etc.
+
 v0.17a "IdegCounter++" :
   - first 0.17 release failed - buggy files outdated docs etc :(
     it's (hopefully) fixed now.
diff --git a/DOCS/INSTALL b/DOCS/INSTALL
index 654e392f25..4a0c409007 100644
--- a/DOCS/INSTALL
+++ b/DOCS/INSTALL
@@ -1,32 +1,31 @@
     =======================================================================
-     * HOW TO COMPILE MOVIE PLAYER COMPONENTS * (C) 2000. A'rpi/ESP-team *
+     * HOW TO COMPILE MOVIE PLAYER COMPONENTS * (C) 2001. A'rpi/ESP-team *
     =======================================================================
 
-Pontscho/Fresh! did some script and makefiles so compiling is much
-easier now. If you find a bug in that, please contact us:
-  pontscho@makacs.poliod.hu
-  arpi@esp-team.scene.hu
-
-1. The Player: (mplayer)
-~~~~~~~~~~~~~~~~~~~~~~~~
-  ./configure
-[* check config.h and config.mak files! *]
-  make
-  make install
-[* if you compiled DGA in, check VIDEOCARDS! *]
-
-2. The Codecs: (w32codecs.zip)
+1. The Codecs: (w32codecs.zip)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  unzip w32codecs.zip to /usr/lib/win32
-  Filenames LOWERCASE !
+  download and unzip w32codecs.zip to /usr/lib/win32
+
+Note: the avifile project has similar codecs package, but it differs
+from our, so if you want to use all supported codecs, then use
+our package!
 
-3. Drivers: (mga_vid.o)
+2. Drivers: (mga_vid.o)
 ~~~~~~~~~~~~~~~~~~~~~~~
   cd drivers
   make
   mknod /dev/mga_vid c 178 0
   chmod go+rw /dev/mga_vid
 
+3. The Player: (mplayer)
+~~~~~~~~~~~~~~~~~~~~~~~~
+  ./configure
+[* read messages printed by ./configure, it may be very usefull! *]
+[* check config.h and config.mak files! *]
+  make
+[* check for errors! of none, you should have the ./mplayer binary *]
+  make install
+
 4. Matrox G400 DH TV-out tools:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   cd TVout
@@ -34,8 +33,11 @@ easier now. If you find a bug in that, please contact us:
 
 5. Fonts:
 ~~~~~~~~~
-  Get the .zip file from the DOWNLOAD section
+  Download mp_font3.zip (and optional language updates) and
+  unpack to ~/.mplayer/font/ :
+
   cd ~/.mplayer
   mkdir font
   cd font
-  unzip mp_font1.zip
+  unzip mp_font3.zip
+  unzip mp_font3_hu.zip
diff --git a/DOCS/MAINTAINERS b/DOCS/MAINTAINERS
new file mode 100644
index 0000000000..8f69785d78
--- /dev/null
+++ b/DOCS/MAINTAINERS
@@ -0,0 +1,64 @@
+MPlayer code & doc maintainers:
+===============================
+
+Documentation:
+~~~~~~~~~~~~~~
+Homepage:
+   Design:  Chass
+   Content: Gabucino
+English docs:
+   tech-*.txt, BUGS: A'rpi
+   others: Gabucino
+DOCS translations:
+   Hungarian:  Gabucino & Tibcu
+   Spanish:    TeLeNiEkO
+   Russian:    Nick Kurshev
+
+Platforms/ports:
+~~~~~~~~~~~~~~~~
+DEBIAN packaging:  Dariush Pietrzak
+FreeBSD support:   Vladimir Kushnir
+Solaris 8 support: Jürgen Keil
+
+MPlayer code:
+~~~~~~~~~~~~~
+fileformat detection, demuxers: A'rpi
+DVD support: LGB
+network streaming: Bertrand BAUDET
+A-V sync code: A'rpi
+subtitles file parser/reader: Lez
+config files & commandline parser: Szabi
+fastmemcpy: Nick
+LIRC support: Acki
+
+libvo drivers:
+~~~~~~~~~~~~~~
+vo_3dfx.c   - OBSOLOTED, use xv
+vo_dga.c    - Acki
+vo_fbdev.c  - Szabi
+vo_fsdga.c  - OBSOLOTED, use dga
+vo_ggi.c    - al3x
+vo_gl.c     - A'rpi
+vo_md5.c    - A'rpi
+vo_mga.c    - A'rpi
+vo_null.c   - A'rpi
+vo_odivx.c  - A'rpi
+vo_pgm.c    - A'rpi
+vo_png.c    - Atmos
+vo_sdl.c    - Atmos
+vo_svga.c   - se7en
+vo_syncfb.c - OBSOLOTED, use mga
+vo_x11.c    - Pontscho
+vo_xmga.c   - Pontscho
+vo_xv.c     - Pontscho
+
+libao2 drivers:
+~~~~~~~~~~~~~~~
+ao_alsa5.c  - al3x
+ao_alsa9.c  - al3x
+ao_null.c   - A'rpi
+ao_oss.c    - A'rpi
+ao_pcm.c    - Atmos
+ao_sdl.c    - Atmos
+ao_sun.c    - Jürgen Keil
+
diff --git a/DOCS/MPlayer-FAQ b/DOCS/MPlayer-FAQ
index d185f5a4e3..7c149827f6 100644
--- a/DOCS/MPlayer-FAQ
+++ b/DOCS/MPlayer-FAQ
@@ -25,7 +25,7 @@ A: Where did you install the SDL library? If you installed in /usr/local
 
 Q: It doesn't compile, and it misses uint64_t inttypes.h and similar things...
 A: copy DOCS/inttypes.h to MPlayer directory (cp DOCS/inttypes.h .)
-   try again... if fail, contact me
+   try again... if fail, contact us
 
 Q: I have Pentium III but ./configure doesn't detect SSE
 A: Only kernel versions 2.4.x supports SSE (or try latest 2.2.19 or newer, but
diff --git a/DOCS/MTRR b/DOCS/MTRR
index cdfd4128dd..8095cbf704 100644
--- a/DOCS/MTRR
+++ b/DOCS/MTRR
@@ -1,5 +1,5 @@
-Setting up MTRR for X11 or mga_vid:
-===================================
+Setting up MTRR for X11 3.3.x, SVGAlib or mga_vid:
+==================================================
 
 1. find the base address
 ~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/DOCS/OpenDivX b/DOCS/OpenDivX
index 91dfa4bb8e..dd2cfbe3a5 100644
--- a/DOCS/OpenDivX
+++ b/DOCS/OpenDivX
@@ -9,8 +9,9 @@ MMX-optimized Decore. OpenDivX version supported in MPlayer : 4.0alpha48
 
 Decoder:
 ~~~~~~~~
-Now it's used for AVI files with fourcc 'dvx1'
-You can adjust Quality level using the -pp option.
+Now it's used for AVI & ASF files with fourcc 'dvx1' and 'divx'
+
+You can adjust Quality level using the -pp option:
 Combine (add) flags you need:
 
 1   Y  horizontal deblocking
@@ -25,9 +26,12 @@ For example, if you want horiz+vert chroma deblocking, then use
 
 Note: C filters works only with n*16 height movies.
 
+Note2: the postprocessing filter can be used for mpeg 1/2 files too (-pp)
+
 Encoder:
 ~~~~~~~~
 There is a very alpha hack to convert video into OpenDivX .avi files.
 Audio is automatically disabled. Select 'odivx' video device as output:
   mplayer input.mpg -vo odivx -encode output.avi
 Yes, I know that it's unusable now, it's only for testing purposes.
+Real encoding feature (with audio) is planned, but in the far future.
diff --git a/DOCS/README b/DOCS/README
index bcdce75f4d..9eff2a13b9 100644
--- a/DOCS/README
+++ b/DOCS/README
@@ -1,6 +1,6 @@
-MPlayer                         (C) 2000-2001 Arpad Gereoffy (A'rpi/ESP-team)
-=============================== * See the file AUTHORS for the complete list *
-http://mplayer.sourceforge.net
+MPlayer - Movie Player for LINUX (C) 2000-2001 Arpad Gereoffy (A'rpi/ESP-team)
+================================ * See the file AUTHORS for the complete list *
+http://mplayer.sourceforge.net (or http://mplayer.dev.hu)
 
 About:
 ~~~~~~
@@ -8,16 +8,15 @@ MPlayer is a movie player for LINUX. It plays most MPEG, AVI and ASF files,
 supported by many native and Win32 DLL codecs. You can watch VCD, DVD and even
 DivX movies too. 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/SiS) 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 (7 supported types!!!) with hungarian,
-english, cyrillic, czech, korean fonts, and OSD?
+but you can use SDL (and this way all drivers of SDL, for example AAlib) and
+some lowlevel card-specific drivers (for Matrox) 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 (7 supported types!!!) with
+hungarian, english, cyrillic, czech, korean fonts, and OSD?
 
 History:
 ~~~~~~~~
-Yes. Yet another movie player for linux.
-What is the special with this? It works, at least for me :)
+This began a year ago...
 I've tried lots of players under linux (mtv,xmps,dvdview,livid/oms,VideoLAN,
 xine,xanim,avifile,xmmp) but they all have some problem. Mostly with
 special files or with audio/video sync. Most of them is unable to play
@@ -41,6 +40,7 @@ or speed problems too. So I've decided to write/modify one...
 - MPlayer v0.10:
   The MPEG and AVI player in a single binary!
 - MPlayer v0.11:
+  Some new developers joined and from 0.11 the mplayer project is a team-work!
   Added .ASF file support, and OpenDivX (see www.projectmayo.com) en/decoding.
 - MPlayer v0.17 "The IdegCounter"
   The release version of the 0.11pre after 4 months of heavy development!
@@ -76,12 +76,14 @@ Supported input formats:
 - MPEG 1/2 System Stream (PS/PES/VOB) and Elementary Stream (ES) file formats
 - RIFF AVI file format
 - ASF 1.0 file format
-- supports reading from file or stdin
+- supports reading from file, stdin, DVD drive or network via HTTP
+
+Note: about quicktime (.mov/.qt) and realmedia (.ra/.rm) support read the FAQ!
 
 Supported audio & video codecs:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 *** See http://mplayer.sourceforge.net/DOCS/codecs.html ***
-***               for the complete list                 ***
+***       for the complete, daily updated list!!!       ***
 
 The most important video codecs:
 - MPEG1 (VCD) and MPEG2 (DVD) video
@@ -91,8 +93,8 @@ The most important video codecs:
 - MJPEG, ASV2 and other hardware formats
 
 The most important audio codecs:
-- MPEG layer 2, and layer 3 (MP3) audio
-- AC3 dolby audio
+- MPEG layer 2, and layer 3 (MP3) audio (native code, with 3dnow optimization)
+- AC3 dolby audio (native code, with 3dnow optimization)
 - Voxware audio
 - alaw, msgsm, pcm and other simple old audio formats
 
@@ -103,20 +105,19 @@ to get info about its status and about how to help us adding support for it!
 Supported video output devices:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 General:
-- x11:	X11 with SHM extension
+- x11:	X11 with optional SHM extension
 - xv:	X11 using overlays with the Xvideo extension (hardware YUV & scaling)
 - gl:	OpenGL renderer, so far works only with :
 	- all cards with Utah-GLX
 	- Matrox cards with X/DRI >=4.0.3
 	- Radeon with X/DRI CVS
 - dga:	X11 DGA extension
-- fsdga:X11 DGA extension with fullscreen scaling (only 24/32bpp and MPEG!)
 - fbdev:Output to general framebuffers
 - svga: Output to SVGAlib
 - sdl:	1.1.7 : supports software scaling
-	1.1.8 : supports Xvideo
-	1.2.0 : supports aalib
-- aalib:Textmode rendering (through SDL, native driver is coming soon!)
+	1.1.8 : supports Xvideo (hardware scaling/fullscreen)
+	1.2.0 : supports aalib (textmode rendering, very funny!)
+- ggi: similar to SDL
 
 Card specific:
 - mga:	Matrox G200/G400 hardware YUV overlay via the mga_vid device
@@ -132,13 +133,16 @@ Special:
 - odivx:OpenDivX AVI File writer (use -br to set encoding bitrate)
 - null:	Null output (for speed tests/benchmarking)
 
-NOTE: check DOCS/VIDEOCARDS !
+NOTE: check DOCS/VIDEOCARDS for details and requirements!
 
 Supported audio output devices:                                              
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-- OSS driver
-- ALSA driver with OSS emulation (ALSA >= 0.9 only!)
-- ESD with the esddsp utility (not tested)
+- OSS (ioctl) driver
+- SDL driver (supports up/downsampling, esd, arts etc)
+- native ALSA 0.5 driver
+- native ALSA 0.9 driver (buggy, use OSS emulation!)
+- native ESD driver (under development?)
+- SUN audio driver (/dev/audio) for BSD and Solaris8 users
 
 NOTE: check DOCS/SOUNDCARDS for details!
 
@@ -150,11 +154,15 @@ Some *old* benchmark results can be found in the file DOCS/SPEED.
 
 Usage:
 ~~~~~~
-  mplayer [options] [-vo driver] [path/]filename
+  file:  mplayer [options] [path/]filename
+  VCD:   mplayer [options] -vcd trackno /dev/cdrom
+  DVD:   mplayer [options] -dvdauth /dev/dvd filename.VOB
+  net:   mplayer [options] http://site.com/file.[mpg|avi]
 
   Options:
     see  `mplayer -h'  for options
-    see  `mplayer -vo help'  for list of available output drivers
+    see  `mplayer -vo help'  for list of available video output drivers
+    see  `mplayer -ao help'  for list of available audio output drivers
 
   Keys:
     <-  or  ->      seek backward/forward 10 seconds
@@ -260,7 +268,7 @@ the following addresses:
 
 	Send matrox-related questions here,
 	- things about mga_vid,
-	- matrox's official beta drivers (for X 4.xx)
+	- matrox's official beta drivers (for X 4.x.x)
 	- and about matroxfb-TVout stuff.
 
 - mpg12play-portable developers: