changeset 1714:b42b78566029

*** empty log message ***
author gabucino
date Mon, 27 Aug 2001 16:34:31 +0000
parents ab35bee402ff
children c7fb7a3b9ead
files DOCS/Hungarian/documentation.html DOCS/documentation.html DOCS/mplayer.1
diffstat 3 files changed, 263 insertions(+), 97 deletions(-) [+]
line wrap: on
line diff
--- a/DOCS/Hungarian/documentation.html	Mon Aug 27 15:25:11 2001 +0000
+++ b/DOCS/Hungarian/documentation.html	Mon Aug 27 16:34:31 2001 +0000
@@ -94,6 +94,7 @@
      </LI><LI><A HREF="#6.4">6.4 StrongARM</A>
      </LI></UL>
 </LI><LI><A HREF="../documentation.html#A">A. Készítők</A>
+</LI><LI><A HREF="../documentation.html#A2">A. Maintainerek</A>
 </LI><LI><A HREF="#B">B. Levelezési listák</A>
 </LI><LI><A HREF="bugreports.html">C. Hogyan jelents be hibát</A>
 
@@ -459,6 +460,8 @@
 
 <P><B><A NAME=A>Appendix A - Authors</A></B></P>
 
+<P><B><A NAME=A>Appendix A2 - Maintainerek</A></B></P>
+
 <P><B><A NAME=B>Appendix B - Mailing lists</A></B></P>
 
 <P>Jónéhány <B>MPlayer</B> lista van. A következő címeken lehet feliratkozni:</P>
--- a/DOCS/documentation.html	Mon Aug 27 15:25:11 2001 +0000
+++ b/DOCS/documentation.html	Mon Aug 27 16:34:31 2001 +0000
@@ -18,6 +18,7 @@
      <LI><A HREF="#1.2">1.2 History</A></LI>
      <LI><A HREF="#1.3">1.3 Installation</A></LI>
      <LI><A HREF="#1.4">1.4 What about the GUI?</A>
+     <LI><A HREF="#1.5">1.5 Subtitles and OSD</A>
      </LI></UL>
 </LI><LI><A HREF="#2">2. Features</A>
      <UL><LI><A HREF="codecs.html">2.1 Video Formats, Audio & Video Codecs</A>
@@ -94,6 +95,7 @@
      </LI><LI><A HREF="#6.4">6.4 StrongARM</A>
      </LI></UL>
 </LI><LI><A HREF="#A">A. Authors</A>
+</LI><UL><LI><A HREF="#A2">A/2. Maintainers</A></LI></UL>
 </LI><LI><A HREF="#B">B. Mailing lists</A>
 </LI><LI><A HREF="bugreports.html">C. How to report bugs</A>
 
@@ -213,6 +215,58 @@
 It's still under development, but it will be merged and released real soon.
 BTW he needs some nice skins, if you are a good graphician, contact him!!!</P>
 
+<P><B><A NAME=1.5>1.5. Subtitles and OSD</A></B></P>
+
+<P>Yes, <B>MPlayer</B> also supports many kinds of subtitles. Currently
+7 kinds of subtitle can be used by the subreader code. To see what are
+these subtitle formats, see subreader.c, line ~20.</P>
+
+<P>Subtitles are displayed with a technique called <B>'OSD', On Screen Display</B>.
+OSD is used to display current time, volume bar, seek bar etc.</P>
+
+<P><B>INSTALLING OSD and SUB</B></P>
+
+<P>You need an <B>MPlayer</B> font package to be able to use OSD/SUB feature.
+There are many ways to get it:
+<UL>
+
+<LI>use the font generator tool at TOOLS/subfont-c
+It's a complete tool to convert from TTF/Type1/etc font to mplayer font pkg.
+(read TOOLS/subfont-c/README for details)
+
+<LI>use the font generator GIMP plugin at TOOLS/subfont-GIMP
+(note: you must have HSI RAW plugin too, see URL below)
+
+<LI>download ready-to-use font packages from <B>MPlayer</B> site.
+Note: currently available fonts are limited for iso 8859-1/2 support,
+and there are a few special versions for korean, russian etc codepages.
+You better build fonts yourself with the tool mentioned above.
+Font should have appropriate font.desc file which maps unicode font
+positions to the actual code page of the subtitles text. Other solution
+is to have subtitles encoded in utf8 encoding and use -utf8 option
+or just name the subtitles file <video_name>.utf and have it in the same
+dir as the video file. Recoding from different codepages to utf8 could be
+done by using konwert (debian) or iconv (RedHat) programs.<BR>
+Some URLs:
+<UL>
+  <LI><A HREF="ftp://ftp.mplayerhq.hu/MPlayer/releases/">ftp://ftp.mplayerhq.hu/MPlayer/releases/</A> - ISO fonts, OBSOLETED!
+  <LI><A HREF="ftp://ftp.mplayerhq.hu/MPlayer/contrib/fonts/">ftp://ftp.mplayerhq.hu/MPlayer/contrib/fonts/</A> - various fonts by users
+  <LI><A HREF="http://realtime.ssu.ac.kr/~lethean/mplayer">http://realtime.ssu.ac.kr/~lethean/mplayer</A> - korean fonts & RAW plugin
+</UL>
+</P>
+<P>After that, UNZIP the files to ~/.mplayer/font/ .
+Now you have to see a clock at the upper left corner of the movie
+(switch it off with 'o') .</P>
+
+<P>OSD has 3 states: (switch with 'o')<BR>
+<UL>
+  <LI>clock + volume bar + seek bar + subtitles (default)
+  <LI>volume bar + seek bar + subtitles
+  <LI>subtitles only
+</UL>
+
+<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>
@@ -306,7 +360,7 @@
   end</PRE></P>
 
 <P>If you don't like the standard location for the lirc-config file (~/.lircrc) 
-use the -lircconf [filename] switch to specify another file.</P>
+use the -lircconf &lt;filename&gt; switch to specify another file.</P>
 
 <P><B><A NAME=3.3>3.3. Streaming from network or pipes</A></B></P>
 
@@ -465,7 +519,7 @@
 <P ALIGN=center><B><U>The <B>MPlayer</B> project:</U></B></P>
 
 <P><UL>
-<LI>Árpád Gereöffy (A'rpi/ESP-team):  [arpi@thot.banki.hu]
+<LI>Árpád Gereöffy (A'rpi/ESP-team):  &lt;arpi@thot.banki.hu&gt;
 <UL><LI>player code (mpeg stream demultiplexer and avi/asf parser, A-V sync, seek...)
 </LI><LI>mp3lib, based on mpglib sources  [MP3 audio decoder]
 </LI><LI>getch2  [keyboard handler]
@@ -480,9 +534,9 @@
 </LI><LI>DivX4Linux (ProjectMayo) support (see documentation)
 </LI></UL>
 
-</LI><LI>Zoltán Ponekker (Pontscho/Fresh!):  [pontscho@makacs.poliod.hu] 
+</LI><LI>Zoltán Ponekker (Pontscho/Fresh!):  &lt;pontscho@makacs.poliod.hu&gt; 
 <UL><LI>configure script and Makefiles for easy compile
-</LI><LI>GUI system (near complete!?)
+</LI><LI>GUI system
 </LI><LI>3DNow! support into mp3lib
 </LI><LI>3DNow! support into fastmemcpy.h
 </LI><LI>various X11 driver changes (keyboard handling, fullscreen, bpp detect, etc)
@@ -490,15 +544,14 @@
 </LI><LI>audio mixer (volume) support
 </LI></UL>
 
-</LI><LI>Gábor Lénárt (LGB): [lgb@lgb.hu]
+</LI><LI>Gábor Lénárt (LGB): &lt;lgb@lgb.hu&gt;
 <UL><LI>./configure script improvements
 </LI><LI>Makefile improvements
 </LI><LI>prelimenary DVD support
-</LI><LI>another GUI code (is that so..?)
 </LI><LI>various X11 cleanups and fixes
 </LI></UL>
 
-</LI><LI>Gábor Bérczi (Gabucino):  [gabucino@k2.jozsef.kando.hu]
+</LI><LI>Gábor Bérczi (Gabucino):  &lt;gabucino@k2.jozsef.kando.hu&gt;
 <UL><LI>documentation maintainer
 </LI><LI>hungarian translation of documentation
 </LI><LI>second webpage design&gfx
@@ -509,7 +562,7 @@
 </LI><LI>experimental MINIX port :)
 </LI></UL>
 
-</LI><LI>Szabolcs Berecz (Szabi): [szabi@inf.elte.hu]
+</LI><LI>Szabolcs Berecz (Szabi): &lt;szabi@inf.elte.hu&gt;
 <UL><LI>codecs.conf file parser
 </LI><LI>config file and command line parser
 </LI><LI>mga_vid fixes, module option etc.
@@ -517,31 +570,31 @@
 </LI><LI>type #7 subtitle support
 </LI></UL>
 
-</LI><LI>László Megyer (Lez, Laaz): [lez@sch.bme.hu]
+</LI><LI>László Megyer (Lez, Laaz): &lt;lez@sch.bme.hu&gt;
 <UL><LI>SUB reader
 </LI><LI>screensaver+DPMS disable for libvo
 </LI></UL>
 
-</LI><LI>Gyula László (Chass, Tégla): [chass-@freemail.hu]
+</LI><LI>Gyula László (Chass, Tégla): &lt;chass-@freemail.hu&gt;
 <UL><LI>first fonts (mp_font1.zip)
 </LI><LI>third (current) homepage design&gfx
 </LI></UL>
 
-</LI><LI>Zoltán Márk Vicián (Se7en): [se7en@sch.bme.hu]
+</LI><LI>Zoltán Márk Vicián (Se7en): &lt;se7en@sch.bme.hu&gt;
 <UL><LI>SVGAlib support in libvo
 </LI></UL>
 
-</LI><LI>Alex Beregszaszi (Al3x): [alex@naxine.org]
+</LI><LI>Alex Beregszaszi (Al3x): &lt;alex@naxine.org&gt;
 <UL><LI>ALSA output driver in libao2
 </LI><LI>vo_ggi output driver in libvo (www.ggi-project.org)
 </LI></UL>
 
-</LI><LI>Andreas Ackermann (Acki):  [asackerm@stud.informatik.uni-erlangen.de]
+</LI><LI>Andreas Ackermann (Acki):  &lt;asackerm@stud.informatik.uni-erlangen.de&gt;
 <UL><LI>LIRC support (see documentation)
 </LI><LI>DGA support in libvo
 </LI></UL>
 
-</LI><LI>Felix Bünemann (Atmos): [atmosfear@users.sourceforge.net]
+</LI><LI>Felix Bünemann (Atmos): &lt;atmosfear@users.sourceforge.net&gt;
 <UL><LI>SDL driver maintainer
 </LI><LI>Additional YUV formats fixes
 </LI><LI>New font (mp_font2.zip)
@@ -551,54 +604,54 @@
 </LI><LI>RAW PCM/WAVE file writer for libao2
 </LI></UL>
 
-</LI><LI>TeLeNiEkO: [telenieko@telenieko.com]
+</LI><LI>TeLeNiEkO: &lt;telenieko@telenieko.com&gt;
 <UL><LI>spanish translation of documentation
 </LI></UL>
 
-</LI><LI>Michael Graffam: [mgraffam@idsi.net]
+</LI><LI>Michael Graffam: &lt;mgraffam@idsi.net&gt;
 <UL><LI>XF86VidMode support to vo_x11 and vo_dga
 </LI><LI>Video mode switching code to vo_dga
 </LI></UL>
 
-</LI><LI>Jens Hoffmann: [hoffmajs@gmx.de]
+</LI><LI>Jens Hoffmann: &lt;hoffmajs@gmx.de&gt;
 <UL><LI>Additional YUV formats support
 </LI><LI>found the big BITMAPINFOHEADER problem -> solved ASV2 pixelization
 </LI></UL>
 
-</LI><LI>Nick Kurshev: [nickols_k@mail.ru]
+</LI><LI>Nick Kurshev: &lt;nickols_k@mail.ru&gt;
 <UL><LI>memcpy optimizations for AMD K7 and Intel Pentium III  (fastmemcpy.h)
 </LI><LI>CDROM tune info
 </LI><LI>further 3DNow! optimizations into mp3lib and libac3 and ffmpeg
 </LI><LI>russian translation of documentation
 </LI></UL>
 
-</LI><LI>German Gomez Garcia: [german@piraos.com]
+</LI><LI>German Gomez Garcia: &lt;german@piraos.com&gt;
 <UL><LI>DVD .ifo parser and chapter selection [not yet in the main trunk]
 </LI><LI>SPDIF AC3 output for SBLive!
 </LI></UL>
 
-</LI><LI>Dariush Pietrzak (Eyck): [eyck@incubus.ar.lublin.pl]
+</LI><LI>Dariush Pietrzak (Eyck): &lt;eyck@incubus.ar.lublin.pl&gt;
 <UL><LI>debian packaging support (see debian/* and this documentation)
 </LI><LI>support for vplayer subtitle format
 </LI><LI>prelimenary support for .RT subtitle format
 </LI></UL>
 
-</LI><LI>Marcus Comstedt: [marcus@idonex.se]
+</LI><LI>Marcus Comstedt: &lt;marcus@idonex.se&gt;
 <UL><LI>initial solaris8-x86 support
 </LI></UL>
 
-</LI><LI>Jürgen Keil and Marcus Comstedt: [jk@tools.de] [marcus@idonex.se]
+</LI><LI>Jürgen Keil and Marcus Comstedt: &lt;jk@tools.de&gt; &lt;marcus@idonex.se&gt;
 <UL><LI>patched <B>MPlayer</B> to work on Solaris 8 x86
 </LI><LI>configure fixes
 </LI><LI>various fixes (win32, configure, etc)
 </LI><LI>SUN audio driver in libao2
 </LI></UL>
 
-</LI><LI>Vladimir Kushnir: [vkushnir@Alfacom.net]
+</LI><LI>Vladimir Kushnir: &lt;vkushnir@Alfacom.net&gt;
 <UL><LI>patched <B>MPlayer</B> to work on FreeBSD x86
 </LI></UL>
 
-</LI><LI>Bertrand BAUDET: [bertrand_baudet@yahoo.com]
+</LI><LI>Bertrand BAUDET: &lt;bertrand_baudet@yahoo.com&gt;
 <UL><LI>network streaming support
 </LI></UL>
 
@@ -610,12 +663,12 @@
 <UL><LI>GIMP font generator plugin (TOOLS/subfont-gimp)
 </LI></UL>
 
-</LI><LI>Adam Tla/lka: [atlka@pg.gda.pl]
+</LI><LI>Adam Tla/lka: &lt;atlka@pg.gda.pl&gt;
 <UL><LI>osd/sub review, fixes, optimization, utf8 support
 </LI></LI>various fixes
 </LI></UL>
 
-</LI><LI>Folke Ashberg: [folke@ashberg.de]
+</LI><LI>Folke Ashberg: &lt;folke@ashberg.de&gt;
 <UL><LI>native AAlib driver (-vo aa)
 </LI></UL>
 
@@ -634,32 +687,32 @@
 <P ALIGN=center><B><U>The codecs, libs:</U></B></P>
 
 <P><UL>
-<LI>Aaron Holtzman:  [aholtzma@engr.uvic.ca]
+<LI>Aaron Holtzman:  &lt;aholtzma@engr.uvic.ca&gt;
 <UL><LI>ac3dec (and libac3) author  [AC3 audio decoder]
 </LI><LI>mga_vid driver  [Matrox G200/G400 YUV Back-end Scaler]
 </LI><LI>mpeg2dec        [Fast MPEG1/MPEG2 video decoder, currently used in player]
 </LI></UL>
 
-</LI><LI>Michel Lespinasse:  [walken@zoy.org]
+</LI><LI>Michel Lespinasse:  &lt;walken@zoy.org&gt;
 <UL><LI>did large libmpeg2 changes for better speed and mpeg conformance
 </LI></UL>
 
-</LI><LI>Eugene Kuznetsov:  [divx@euro.ru]
+</LI><LI>Eugene Kuznetsov:  &lt;divx@euro.ru&gt;
 <UL><LI>avifile author  [AVI player library for linux, using Win32 VfW/ACM codecs]
 </LI><LI>technical help about AVI and ASF formats, and how to get YUV using VfW...
 </LI><LI>divx4linux techical support
 </LI></UL>
 
-</LI><LI>Zdenek Kabelac:  [kabi@informatics.muni.cz]
+</LI><LI>Zdenek Kabelac:  &lt;kabi@informatics.muni.cz&gt;
 <UL><LI>current avifile maintainer(?)
 </LI><LI>some technical help about the win32 stuff and timers
 </LI></UL>
 
-</LI><LI>Gerard Lantau: [glantau@yahoo.fr]
+</LI><LI>Gerard Lantau: &lt;glantau@yahoo.fr&gt;
 <UL><LI>ffmpeg/libavcodec author,maintainer (opensource mpeg, mjpeg, divx en/decoder)
 </LI></UL>
 
-</LI><LI>Project Mayo:  [http://www.projectmayo.com]
+</LI><LI>Project Mayo:  &lt;http://www.projectmayo.com&gt;
 <UL><LI>the OpenDivX codec authors
 </LI></UL>
 
@@ -682,16 +735,95 @@
 <UL><LI>AVI FAQ author/collector. [site with many useful docs on codecs and avi fmt]
 </LI></UL>
 
-</LI><LI>Dirk Farin:      [farin@ti.uni-mannheim.de]
+</LI><LI>Dirk Farin:      &lt;farin@ti.uni-mannheim.de&gt;
 <UL><LI>dvdview author  [MPEG1/MPEG2 video decoder, used in v0.5-v0.8]
 </LI></UL>
 
-</LI><LI>Adam Williams:   [broadcast@earthling.net]
+</LI><LI>Adam Williams:   &lt;broadcast@earthling.net&gt;
 <UL><LI>libmpeg3 (and xmovie) author  [MPEG1/MPEG2 video decoder, used in v0.1-v0.4]
 </LI></UL>
 
 </UL></P>
 
+<P><B><A NAME=A2>Appendix A/2 - MPlayer code and documentation maintainers</A></B></P>
+
+<P>Homepage
+<UL>
+  <LI><B>Design</B>: Chass
+  <LI><B>Contents</B>: Gabucino
+</UL></P>
+<P>English documentation
+<UL>
+  <LI><B>tech-*.txt</B>: A'rpi
+  <LI><B>all the others</B>: Gabucino
+</UL></P>
+<P>Documentation translations
+<UL>
+  <LI><B>Hungarian</B>: Gabucino
+  <LI><B>Spanish</B>: TeLeNiEkO (outdated)
+  <LI><B>Russian</B>: Nick Kurshev (outdated)
+  <LI><B>Polish</B>: Dariush Pietrzak (outdated)
+  <LI><B>German</B>: Atmosfear (outdated)
+</UL></P>
+<P>Platforms/ports
+<UL>
+  <LI><B>DEBIAN packaging</B>: Dariush Pietrzak
+  <LI><B>FreeBSD support</B>: Vladimir Kushnir
+  <LI><B>Solaris 8 support</B>: Jürgen Keil
+</UL></P>
+<P>MPlayer code:
+<UL>
+  <LI><B>fileformat detection, demuxers</B>: A'rpi
+  <LI><B>DVD support</B>: (alpha version was: LGB) now: ?
+  <LI><B>network streaming</B>: Bertrand BAUDET
+  <LI><B>A-V sync code</B>: A'rpi
+  <LI><B>subtitles file parser/reader</B>: Lez (most of them)
+  <LI><B>config files & commandline parser</B>: Szabi
+  <LI><B>fastmemcpy</B>: Nick Kurshev
+  <LI><B>LIRC support</B>: Acki
+  <LI><B>SUB/OSD renderer</B>: Adam Tla/lka
+</UL></P>
+<P>libvo drivers:
+<UL>
+  <LI><B>vo_3dfx.c</B>   - OBSOLETED, use xv
+  <LI><B>vo_aa.c</B>     - Folke Ashberg
+  <LI><B>vo_dga.c</B>    - Acki
+  <LI><B>vo_fbdev.c</B>  - Szabi
+  <LI><B>vo_fsdga.c</B>  - OBSOLETED, use dga
+  <LI><B>vo_ggi.c</B>    - al3x
+  <LI><B>vo_gl.c</B>     - A'rpi
+  <LI><B>vo_md5.c</B>    - A'rpi
+  <LI><B>vo_mga.c</B>    - A'rpi
+  <LI><B>vo_null.c</B>   - A'rpi
+  <LI><B>vo_odivx.c</B>  - A'rpi
+  <LI><B>vo_pgm.c</B>    - A'rpi
+  <LI><B>vo_png.c</B>    - Atmos
+  <LI><B>vo_sdl.c</B>    - Atmos
+  <LI><B>vo_svga.c</B>   - se7en
+  <LI><B>vo_syncfb.c</B> - OBSOLETED, use mga
+  <LI><B>vo_x11.c</B>    - Pontscho
+  <LI><B>vo_xmga.c</B>   - Pontscho
+  <LI><B>vo_xv.c</B>     - Pontscho
+  <LI><B>vo_aa.c</B>     - Folke Ashberg
+</UL></P>
+<P>libao2 drivers:
+<UL>
+  <LI><B>ao_alsa5.c</B>  - al3x
+  <LI><B>ao_alsa9.c</B>  - al3x (BUGGY, use oss)
+  <LI><B>ao_null.c</B>   - A'rpi
+  <LI><B>ao_oss.c</B>    - A'rpi
+  <LI><B>ao_pcm.c</B>    - Atmos
+  <LI><B>ao_sdl.c</B>    - Atmos
+  <LI><B>ao_sun.c</B>    - Jürgen Keil
+</UL></P>
+<P>TOOLS:
+<UL>
+  <LI><B>subfont-c</B> - Artur Zaprzala: <zybi@fanthom.irc.pl>
+  <LI><B>subfont-GIMP</B> - lanzz@lanzz.org
+  <LI><B>*.pl</B> - Atmos
+  <LI><B>others</B> - A'rpi
+</UL></P>
+
 <P><B><A NAME=B>Appendix B - Mailing lists</A></B></P>
 
 <P>There are some public mailing lists on <B>MPlayer</B>. Subscribing can be
--- a/DOCS/mplayer.1	Mon Aug 27 15:25:11 2001 +0000
+++ b/DOCS/mplayer.1	Mon Aug 27 16:34:31 2001 +0000
@@ -6,23 +6,23 @@
 mplayer \- Movie Player for Linux
 .SH SYNOPSIS
 .B mplayer
-.RB [ \-v\ ]
-.RB [ \-quiet\ ]
-.RB [ \-vo\ <driver>[:<device>]\ ]
-.RB [ \-ao\ <driver>[:<device>]\ ]
+.RB [ \-v ]
+.RB [ \-quiet ]
+.RB [ \-vo\ <driver>[:<device>] ]
+.RB [ \-ao\ <driver>[:<device>] ]
 .RB [ \-vcd\ track\ number ]
 .RB [ \-sb\ byte\ position ]
-.RB [ \-nosound\ ]
+.RB [ \-nosound ]
 .RB [ \-abs\ seconds ]
 .RB [ \-delay\ secs ]
-.RB [ \-bps\ ]
+.RB [ \-bps ]
 .RB [ \-aid\ id ]
 .RB [ \-vid\ id ]
 .RB [ \-fps\ rate ]
 .RB [ \-mc\ seconds/5f ]
-.RB [ \-fs\ ]
-.RB [ \-vm\ ]
-.RB [ \-zoom\ ]
+.RB [ \-fs ]
+.RB [ \-vm ]
+.RB [ \-zoom ]
 .RB [ \-x\ x ]
 .RB [ \-y\ y ]
 .RB [ \-xy\ factor ]
@@ -33,40 +33,42 @@
 .RB [ \-sub\ file ]
 .RB [ \-subfps\ rate ]
 .RB [ \-subdelay\ sec ]
-.RB [ \-dvdauth\ device ]
 .RB [ \-z\ <0-8> ]
 .RB [ \-idx ]
 .RB [ \-forceidx ]
 .RB [ \-nodshow ]
 .RB [ \-noxv ]
 .RB [ \-forcexv ]
-.RB [ \-ss\ sec ]
-.RB [ \-dumpaudio ]
-.RB [ \-dumpvideo ]
-.RB [ \-noframedrop ]
-.RB [ \-framedrop ]
-.RB [ \-nodouble ]
-.RB [ \-double ]
-.RB [ \-dvdkey\ key ]
-.RB [ \-stereo\ mode ]
-.RB [ \-srate\ Hz ]
-.RB [ \-osdlevel\ level ]
-.RB [ \-config\ file ]
-.RB [ \-display\ name ]
-.RB [ \-unicode ]
-.RB [ \-utf8 ]
-.RB [ \-fsmode\ mode ]
-.RB [ \-vc\ video\ codec\ name ]
-.RB [ \-ac\ audio\ codec\ name ]
-.RB [ \-vfm\ video\ codec\ family ]
-.RB [ \-afm\ audio\ codec\ family ]
-.RB [ \-frames\ number ]
-.RB [ \-autoq\ quality ]
-.RB [ \-fb\ device ]
-.RB [ \-fbmode\ modename ]
-.RB [ \-fbmodeconfig filename ]
-.RB [ \-benchmark ]
-.I - or file
+.RB [ \-ss\ sec\]
+.RB [ \-dumpaudio]
+.RB [ \-dumpvideo]
+.RB [ \-noframedrop]
+.RB [ \-framedrop]
+.RB [ \-nodouble]
+.RB [ \-double]
+.RB [ \-stereo\ mode]
+.RB [ \-srate\ Hz]
+.RB [ \-osdlevel\ level]
+.RB [ \-config\ file]
+.RB [ \-display\ name]
+.RB [ \-unicode]
+.RB [ \-utf8]
+.RB [ \-fsmode\ mode]
+.RB [ \-vc\ video\ codec\ name]
+.RB [ \-ac\ audio\ codec\ name]
+.RB [ \-vfm\ video\ codec\ family]
+.RB [ \-afm\ audio\ codec\ family]
+.RB [ \-frames\ number]
+.RB [ \-autoq\ quality]
+.RB [ \-fb\ device]
+.RB [ \-fbmode\ modename]
+.RB [ \-fbmodeconfig\ filename]
+.RB [ \-benchmark]
+.RB [ \-dvd\ titleid]
+.RB [ \-chapter\ chapterid]
+.RB [ \-dvdangle\ angleid]
+.RB [ \-dvdkey\ key]
+.I - or file or device
 .PP
 .SH DESCRIPTION
 .I mplayer
@@ -87,6 +89,17 @@
 .I NOTE
 Every "flag" option has "noflag" pair, e.g. -fs opposite is -nofs
 .TP
+.B \-dvd\ titleid
+tell MPlayer which movies (marked with titleid) to play. For example
+sometimes '1' are trailers, and '2' is the real movie.
+.TP
+.B \-chapter\ chapterid
+specify which chapter to start playing at. Examples can be found below.
+.TP
+.B \-dvdangle\ angleid
+some DVD discs contain scenes that can be viewed from multiple angles.
+Here you can tell MPlayer which angels to use. Examples can be found below.
+.TP
 .B \-vo\ <driver>[:<device>]
 select video output driver and optinaly device. "device" is valid with
 SDL and GGI too, it means sub-driver then (for example: -vo sdl:aalib).
@@ -109,10 +122,6 @@
 .B \-vcd\ track
 play video cd track from device instead of plain file
 .TP
-.B \-dvdauth\ device
-specify DVD-ROM drive to use for MPEG2 decoding.
-(use *_only_* when playing from DVD!)
-.TP
 .B \-nosound
 don't play sound
 .TP
@@ -152,7 +161,7 @@
 dynamically changes the level of postprocess, depending on spare CPU
 time available. Uses the same value ranges as -pp . The number you
 specify will be the maximum level used. Usually you can use some big
-number.
+number. You don't have to (and don't) use together with -pp !
 .TP
 .B \-ffactor\ number
 resample alphamap of the font. Can be:
@@ -192,7 +201,8 @@
 .SH "ADVANCED OPTIONS"
 .TP
 .I NOTE
-These options can help you solve your particular problem.. Also, see the DOCS!
+These options can help you solve your particular problem.. Also, see the
+documentation !
 .TP
 .B \-vc <name>
 force usage of a specific video codec, according to its name in codecs.conf,
@@ -201,6 +211,7 @@
     -vc divx       use VFW DivX codec
     -vc divxds     use DirectShow DivX codec
     -vc ffdivx     use libavcodec's DivX codec
+    -vc ffmpeg12   use libavcodec's MPEG1/2 codec
     -vc divx4      use ProjectMayo's DivX codec
 .TP
 .B \-ac <name>
@@ -210,27 +221,31 @@
     -ac mp3        use libmp3 MP3 codec
     -ac mp3acm     use l3codeca.acm MP3 codec
     -ac ac3        use AC3 codec
+    -ac hwac3      enable Hardware AC3 passthrough
+                   (see documentation)
 .TP
 .B \-vfm <1-5>
 force usage of a specific codec FAMILY, and FALLBACK to default if failed.
 For example:
 
     -vfm 2         use VFW (Win32) codecs
-    -vfm 3         use OpenDivX codec (YV12)
+    -vfm 3         use OpenDivX/DivX4 codec (YV12)
                    (same as -vc odivx but fallback)
     -vfm 4         use DirectShow (Win32) codecs
     -vfm 5         use libavcodec codecs
-    -vfm 7         use DivX4Linux codec (YUY2)
+    -vfm 7         use DivX4 codec (YUY2)
                    (same as -vc divx4 but fallback)
 
-NOTE : type 3 and 7 now contains just the one same codec, then OpenDivX 4.0
-beta. For difference between them and when to use which, check the OpenDivX
-section in the documentation.
+NOTE : if libdivxdecore support was compiled in, then type 3 and 7 now contains
+just the same DivX4 codec, but different APIs to reach it. For difference
+between them and when to use which, check the DivX4 section in the
+documentation.
 .TP
 .B \-afm <1-5>
 force usage of a specific audio format. For example:
 
-    -afm 1         use libmp3 (mp1/mp2/mp3)
+    -afm 1         use libmp3 (mp2/mp3,
+                   but not mp1)
     -afm 2         suppose raw PCM audio
     -afm 3         use libac3
     -afm 4         use a matching Win32 codec
@@ -311,10 +326,10 @@
 .TP
 .B \-dvdkey key
 key to decrypt stream encrypted with CSS. For example : -dvdkey F169072699
-(this is NOT for DVD playing! For DVD use the -dvdauth option!)
+(this is NOT for DVD playing! For DVD use the -dvd option!)
 .TP
 .B \-stereo mode
-select type of MPEG1 stereo output. Mode may be 0:stereo 1:left 2:right
+select type of MPEG1 stereo output.
 
         Stereo         0
         Left channel   1
@@ -343,10 +358,12 @@
 fullscreen mode. If you experience fullscreen problems, try changing this
 value between 0 and 7.
 
-        -fsmode 0      new method (since 0.18pre3)
-        -fsmode 1      ICCCWM patch (for KDE2/icewm)
-        -fsmode 2      old method (0.17a)
-	-fsmode 3      ICCCWM patch + Motif method
+        -fsmode 0      new method
+        -fsmode 1      ICCCWM patch
+                       (for KDE2/icewm)
+        -fsmode 2      old method
+        -fsmode 3      ICCCWM patch
+                       plus Motif method
 .TP
 .B \-frames\ number
 MPlayer plays <number> frames, then quits.
@@ -370,7 +387,8 @@
 .TP
 .I NOTE
 These are included in this manpage just for completeness! If you don't
-know what are these, you DON'T need these! In either case, double-check DOCS!
+know what are these, you DON'T need these! In either case, double-check the
+documentation !
 .TP
 .B \-br\ rate
 used with '-vo odivx' .
@@ -383,6 +401,9 @@
 .TP
 .B \-dumpvideo
 dump video stream to ./stream.dump (only with MPEG-PS) (not very usable)
+.TP
+.B \-sid
+specify DVD subtitle (?)
 .IP
 .SH KEYBOARD CONTROL
 .TP
@@ -436,31 +457,41 @@
 SAMI (smi), vplayer, RealMedia RT, ssa (Sub Station Alpha).
 Sub files are searched in this priority : (for example /mnt/cdrom/movie.avi)
     /mnt/cdrom/movie.sub
-        (SUB/srt/SRT/smi/SMI/rt/RT/txt/TXT)
+     (utf/UTF/sub/SUB/srt/SRT/smi/SMI/rt/RT/txt/TXT/ssa/SSA)
     $HOME/.mplayer/sub/movie.sub
-        (SUB/srt/SRT/smi/SMI/rt/RT/txt/TXT)
+     (utf/UTF/sub/SUB/srt/SRT/smi/SMI/rt/RT/txt/TXT/ssa/SSA)
     $HOME/.mplayer/default.sub
 .IP
 .SH "EXAMPLES"
-Just launch it! :)
+.B Quickstart DVD playing
+mplayer -dvd 1
+.TP
+.B Multiangle DVD playing
+mplayer -dvd 1 -dvdangle 2
+.TP
+.B Playing from a different DVD device
+mplayer -dvd 1 /dev/dvd2
+.TP
+.B Stream from HTTP
+mplayer http://mplayer.hq/example.avi
 .LP
 .SH BUGS
-Probably. Check DOCS.
+Probably. Check the documentation.
 
 Bugreports should be addressed to the MPlayer-users mailing list
 (mplayer-users@lists.sourceforge.net) ! If you want to submit a bugreport
-(which we love to receive!), please double-check the DOCS/BUGREPORTS, and
+(which we love to receive!), please double-check the bugreports.html, and
 tell us all that we need to know to identify your problem.
 
 .LP
 .SH AUTHORS
-Check DOCS/AUTHORS !
+Check documentation !
 
 MPlayer is (C) 2000-2001
 .I Arpad Gereoffy <arpi@thot.banki.hu>
 
 This manpage is maintained by
-.I Gabucino.
+.I Gabucino .
 .LP
 .SH STANDARD DISCLAIMER
 Use only at your own risk! There may be errors and inaccuracies that could