applied many interesting things from pl's patch, by hand

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

DOCS/mplayer.1

@@ -8,41 +8,42 @@ mplayer \- Movie Player for Linux
 .B mplayer
 .RB [ \-gui ]
 .RB [ \-v ]
+.RB [ \-help / -h / --help ]
 .RB [ \-quiet ]
 .RB [ \-vo\ <driver>[:<device>] ]
 .RB [ \-ao\ <driver>[:<device>] ]
-.RB [ \-vcd\ track\ number ]
-.RB [ \-sb\ byte\ position ]
+.RB [ \-vcd\ <track\ number> ]
+.RB [ \-sb\ <byte\ position> ]
 .RB [ \-nosound ]
-.RB [ \-abs\ bytes ]
-.RB [ \-delay\ secs ]
+.RB [ \-abs\ <bytes> ]
+.RB [ \-delay\ <secs> ]
 .RB [ \-nobps ]
-.RB [ \-aid\ id ]
-.RB [ \-alang\ audio\ stream\ languages ]
-.RB [ \-vid\ id ]
-.RB [ \-fps\ rate ]
-.RB [ \-mc\ seconds/5f ]
+.RB [ \-aid\ <id> ]
+.RB [ \-alang\ <audio\ stream\ languages> ]
+.RB [ \-vid\ <id> ]
+.RB [ \-fps\ <rate> ]
+.RB [ \-mc\ <seconds/5f> ]
 .RB [ \-fs ]
 .RB [ \-vm ]
 .RB [ \-zoom ]
-.RB [ \-x\ x ]
-.RB [ \-y\ y ]
-.RB [ \-sws\ software\ scaler\ type ]
-.RB [ \-xy\ factor ]
-.RB [ \-pp\ quality ]
-.RB [ \-include\ configfile ]
-.RB [ \-lircconf\ configfile ]
-.RB [ \-ffactor\ number ]
-.RB [ \-sub\ file ]
-.RB [ \-subfps\ rate ]
-.RB [ \-subdelay\ sec ]
+.RB [ \-x\ <x> ]
+.RB [ \-y\ <y> ]
+.RB [ \-sws\ <software\ scaler\ type> ]
+.RB [ \-xy\ <factor> ]
+.RB [ \-pp\ <quality> ]
+.RB [ \-include\ <config\ file> ]
+.RB [ \-lircconf\ <config\ file> ]
+.RB [ \-ffactor\ <number> ]
+.RB [ \-sub\ <filename> ]
+.RB [ \-subfps\ <rate> ]
+.RB [ \-subdelay\ <seconds> ]
 .RB [ \-z\ <0-8> ]
 .RB [ \-idx ]
 .RB [ \-forceidx ]
 .RB [ \-nodshow ]
 .RB [ \-noxv ]
 .RB [ \-forcexv ]
-.RB [ \-ss\ time ]
+.RB [ \-ss\ <time> ]
 .RB [ \-dumpaudio ]
 .RB [ \-dumpvideo ]
 .RB [ \-dumpstream ]
@@ -50,40 +51,47 @@ mplayer \- Movie Player for Linux
 .RB [ \-framedrop ]
 .RB [ \-nodouble ]
 .RB [ \-double ]
-.RB [ \-stereo\ mode ]
-.RB [ \-channels\ n ]
-.RB [ \-srate\ Hz ]
-.RB [ \-osdlevel\ level ]
-.RB [ \-config\ file ]
-.RB [ \-display\ name ]
+.RB [ \-stereo\ <mode> ]
+.RB [ \-channels\ <n> ]
+.RB [ \-srate\ <Hz> ]
+.RB [ \-osdlevel\ <level> ]
+.RB [ \-config\ <file> ]
+.RB [ \-display\ <name> ]
+.RB [ \-wid\ <window\ id> ]
 .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 [ \-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 [ \-monitor_hfreq\ <horizontal\ frequency\ range> ]
+.RB [ \-monitor_vfreq\ <vertical\ frequency\ range> ]
+.RB [ \-monitor_dotclock\ <dotclock\ (or\ pixelclock)\ range> ]
 .RB [ \-benchmark ]
-.RB [ \-dvd\ titleid ]
-.RB [ \-sid\ subtitleid ]
-.RB [ \-slang\ subtitle\ languages ]
-.RB [ \-chapter\ chapterid ]
-.RB [ \-dvdangle\ angleid ]
-.RB [ \-dvdkey\ key ]
-.RB [ \-skin\ skin ]
-.RB [ \-aspect\ ratio ]
-.RB [ \-monitoraspect\ ratio ]
-.RB [ \-subcp\ codepage ]
+.RB [ \-dvd\ <title\ id> ]
+.RB [ \-chapter\ <chapter\ id> ]
+.RB [ \-dvdangle\ <angle\ id> ]
+.RB [ \-alang\ <country\ code> ]
+.RB [ \-slang\ <country\ code> ]
+.RB [ \-sid\ <subtitle \id> ]
+.RB [ \-dvdkey\ <key> ]
+.RB [ \-skin\ <skin\ name> ]
+.RB [ \-aspect\ <ratio> ]
+.RB [ \-monitoraspect\ <ratio> ]
+.RB [ \-subcp\ <codepage> ]
 .RB [ \-dumpmpsub ]
-.RB [ \-screenw\ pixels ]
-.RB [ \-screenh\ pixels ]
-.RB [ \-cache\ kbytes ]
-.RB [ \-bpp\ depth ]
+.RB [ \-dumpfile ]
+.RB [ \-dumpsub ]
+.RB [ \-screenw\ <pixels> ]
+.RB [ \-screenh\ <pixels> ]
+.RB [ \-cache\ <kbytes> ]
+.RB [ \-bpp\ <depth> ]
 .RB [ \-flip ]
 .RB [ \-playlist\ <filename> ]
 .RB [ \-slave ]
@@ -91,53 +99,80 @@ mplayer \- Movie Player for Linux
 .RB [ \-mixer\ <device> ]
 .RB [ \-master\ yes/no ]
 .RB [ \-tv\ suboptions ]
-.I - or file or device
+.RB [ \-dapsync ]
+.RB [ \-softsleep ]
+.I < - | file | URL | device >
 .PP
 .SH DESCRIPTION
 .I mplayer
-MPlayer is a movie player for LINUX (runs on many other Unices, and
-non-x86 CPUs, see section 6). It plays most MPEG, AVI and ASF/WMV files,
-supported by many native and Win32 DLL codecs. You can watch VideoCD,
-SVCD, DVD and even DivX movies too (and you don't need the avifile library
-at 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 (7 supported types!!!) with european/ISO 8859-1,2 (hungarian,
-english, czech, etc), cyrillic, korean fonts, and OSD?
+MPlayer is a movie player for LINUX (runs on many other Unices, and non-x86
+CPUs, see section 6). It plays most MPEG, AVI and ASF/WMV files, supported by
+many native and Win32 DLL codecs. You can watch VideoCD, SVCD, DVD, and even
+DivX 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 :
+X11, Xv, DGA, OpenGL, SVGAlib, fbdev, AAlib, DirectFB, SDL (and all the drivers
+it supports), 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.
+
+Several subtitles types are supported (curently 9 !) and the fonts are
+rendered with nice big antialiased shaded fonts ! Of course there is support
+for european/ISO 8859-1,2 (hungarian, english, czech, etc), cyrillic, korean
+fonts.
 .LP
-.SH "GENERAL OPTIONS"
-.TP
-.I NOTE
-Every "flag" option has "noflag" pair, e.g. -fs opposite is -nofs
+.SH "GUI OPTIONS"
+.I NOTE:
+The GUI code has to be compiled in *explicitly*, for details see the
+documentation.
 .TP
 .B \-gui
-start MPlayer with the GUI mode. You have to compile it in, for details
+start MPlayer in GUI mode.
+.TP
+.B \-skin <skin\ directory>
+load skin from this directory (WITHOUT path name!). For example '-skin fittyfene' tries these :
+
+    /usr/local/share/mplayer/Skin/fittyfene
+    ~/.mplayer/Skin/fittyfene
+.LP
+.SH "DVD OPTIONS"
+.I NOTE:
+These options are valid only with DVD support compiled in. For details,
 see the documentation.
 .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 \-sid\ id
+.B \-sid\ <id>
 Turns on DVD subtitle displaying. Also, you MUST specify a number which
-corresponds to a DVD subtitle language (0-...). For the list of available
+corresponds to a DVD subtitle language (0-31). For the list of available
 subtitles, use with the -v switch and look at the output. (EXPERIMENTAL)
 .TP
-.B \-slang\ subtitle\ language
-See the former, but this option needs a two-letter parameter, a country
-code. Like: -slang hu,us will always select hungarian or if it's non existant
-then english subtitles, if there are any.
-.TP
-.B \-chapter\ chapterid
+.B \-chapter\ <chapter\ id>
 specify which chapter to start playing at. Examples can be found below.
 .TP
-.B \-dvdangle\ angleid
+.B \-dvdangle\ <angle\ id>
 some DVD discs contain scenes that can be viewed from multiple angles.
 Here you can tell MPlayer which angles to use. Examples can be found below.
 .TP
+.B \-alang\ <audio\ stream\ language>
+Used when playing DVD disks. Expects a two-letter country code(s) as
+parameter, and always tries to play back audio streams those language
+matches the given code. For example: -alang hu,us will always try to play
+hungarian or if it's non-existant then english audio streams if there are any.
+.TP
+.B \-slang\ <subtitle\ language>
+See the former, but this option needs a two-letter parameter, a country code.
+Like: -slang hu,us will always select hungarian or if it's non existant then
+english subtitles, if there are any. For the list of available subtitles, use
+with the -v switch and look at the output.
+.LP
+.SH "GENERAL OPTIONS"
+.TP
+.I NOTE
+Every "flag" option has "noflag" pair, e.g. -fs opposite is -nofs
+.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).
@@ -157,7 +192,7 @@ you can get the list of available drivers executing
 .I mplayer -ao help
 
 .TP
-.B \-vcd\ track
+.B \-vcd\ <track>
 play video cd track from device instead of plain file
 .TP
 .B \-nosound
@@ -179,13 +214,13 @@ output drivers support it.
 flip image (useful for example for old Indeo codecs). Supported only(?)
 by the 'sdl' and 'x11' outputs.
 .TP
-.B \-x\ x
-scale image to x width [if driver suppports!]
+.B \-x\ <x>
+scale image to x width (if driver suppports)
 .TP
-.B \-y\ y
-scale image to y height
+.B \-y\ <y>
+scale image to y height (if driver supports)
 .TP
-.B \-sws\ software\ scaler\ type
+.B \-sws\ <software\ scaler\ type>
 this option sets the quality (and speed, respectively) of the software scaler,
 with the -zoom option. For example with x11 or other outputs which lack
 hardware acceleration. Possible settings are :
@@ -194,29 +229,16 @@ hardware acceleration. Possible settings are :
     1 - bilinear
     2 - bicubic (best quality)
 .TP
-.B \-xy\ factor
+.B \-xy\ <factor>
 scale image by <factor>
 .TP
-.B \-pp\ quality
-apply postprocess filter on decoded image.
-You need a STRONG CPU in order to use this!
-The supported formats and settings are:
-
-        MPEG 1/2   0 (none), TODO
-        OpenDivX   0 (none), TODO
-        DivX4      0 (none), TODO
-        DivX       0 (none), TODO
-
-        -pp 0x20000 TODO
-
-.TP
-.B \-autoq\ quality
+.B \-autoq\ <quality>
 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. You don't have to (and don't) use together with -pp !
 .TP
-.B \-ffactor\ number
+.B \-ffactor\ <number>
 resample alphamap of the font. Can be:
 
         0    plain white fonts
@@ -224,26 +246,26 @@ resample alphamap of the font. Can be:
         1    narrow black outline
         10   bold black outline
 .TP
-.B \-sub\ file
+.B \-sub\ <subtitle\ file>
 use/display this subtitle file
 .TP
-.B \-subfps\ rate
-specify frame/sec rate of subtitle file
+.B \-subfps\ <rate>
+specify frame/sec rate of subtitle file (float number)
 (ONLY for frame-based SUB files, i.e. NOT MicroDVD format!)
-(default: the same as the movie)
+(default: the same fps as the movie)
 .TP
-.B \-subdelay\ sec
+.B \-subdelay\ <sec>
 delays subtitles by <sec> seconds. Can be negative.
 .TP
-.B \-osdlevel\ level
+.B \-osdlevel\ <level>
 specifies which mode the OSD should start in (0 : none, 1 : seek, 2: seek+timer)
 (default = 2)
 .TP
-.B \-lircconf\ configfile
+.B \-lircconf\ <config\ file>
 specifies a configfile for LIRC (see http://www.lirc.org) if you don't like the default ~/.lircrc
 .TP
 .B \-v
-enable verbose output (more -v means more verbose)
+enable verbose output (more -v means more verbosity)
 .TP
 .B \-quiet
 display less output, status messages.
@@ -251,22 +273,15 @@ display less output, status messages.
 .B \-benchmark
 used in combination with -nosound and -vo null for benchmarking.
 .TP
-.B \-skin skin directory
-load skin from this directory (WITHOUT path name!). For example '-skin fittyfene' tries these :
-
-    /usr/local/share/mplayer/Skin/fittyfene
-    ~/.mplayer/Skin/fittyfene
-.TP
-.B \-aspect ratio
+.B \-aspect <ratio>
 set aspect ratio of movies. It's autodetected on MPEG files, and can't be
 autodetected on AVI files. Examples:
 
     -aspect 4:3  or -aspect 1.3333
     -aspect 16:9 or -aspect 1.7777
 
-(has -noaspect pair)
 .TP
-.B \-monitoraspect ratio
+.B \-monitoraspect <ratio>
 set aspect ratio of your screen. Examples:
 
     -monitoraspect 4:3  or 1.3333
@@ -276,19 +291,18 @@ set aspect ratio of your screen. Examples:
 .B \-playlist <file>
 play files according to this filelist (1 file/row).
 .TP
-.B \-slave
-This option switches on slave mode. This is intended for use
-of MPlayer as a backend to other programs. Instead of intercepting keyboard
-events, MPlayer will read simplistic command lines from its stdin.
-See section
-.B SLAVE MODE PROTOCOL
-for the syntax.
+.B \-ss\ <time>
+seek to given time position. For example :
+
+    -ss 56         seeks to 56 seconds
+    -ss 01:10:00   seeks to 1 hour 10 min
+
 .TP
 .B \-loop\ <num>
-Loops movie playback <num> times. 0 means forever.
+loops movie playback <num> times. 0 means forever.
 .TP
 .B \-mixer\ <device>
-This option will tell MPlayer to use a different device for mixing than
+this option will tell MPlayer to use a different device for mixing than
 /dev/mixer.
 .TP
 .B \-master\ yes/no
@@ -296,7 +310,7 @@ Setting this option to "yes" will instruct MPlayer to change the MASTER
 mixer channel when setting the volume, and "no" means the PCM channel.
 .TP
 .B \-tv\ suboptions
-This option enables the TV grabbing feature of MPlayer. For complete
+this option enables the TV grabbing feature of MPlayer. For complete
 documentation, please see documentation.html chapter 2.5
 .IP
 .SH "ADVANCED OPTIONS"
@@ -315,7 +329,7 @@ for example :
     -vc ffmpeg12   use libavcodec's MPEG1/2 codec
     -vc divx4      use ProjectMayo's DivX codec
 
-See -vc help for FULL list !
+See '-vc help' for FULL list !
 .TP
 .B \-ac <name>
 force usage of a specific audio codec, according to its name in codecs.conf,
@@ -329,7 +343,7 @@ for example :
     -ac vorbis     use libvorbis
     -ac ffmp3      use ffmpeg's MP3 decoder (SLOW)
 
-See -ac help for FULL list !
+See '-ac help' for FULL list !
 .TP
 .B \-vfm <1-12>
 force usage of a specific codec FAMILY, and FALLBACK to default if failed.
@@ -346,7 +360,8 @@ For example:
 
 See -vc help for FULL list !
 
-NOTE : if libdivxdecore support was compiled in, then type 3 and 7 now contains
+.I 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.
@@ -354,8 +369,7 @@ documentation.
 .B \-afm <1-12>
 force usage of a specific audio format. For example:
 
-    -afm 1         use libmp3 (mp2/mp3,
-                   but not mp1)
+    -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
@@ -365,49 +379,98 @@ force usage of a specific audio format. For example:
 
 See -ac help for FULL list !
 .TP
-.B \-sb\ position
+.B \-sb\ <byte\ position>
 seek to byte position
 .TP
-.B \-ss\ time
-seek to given time position. For example :
-
-    -ss 56
-    -ss 01:10:00
-
-.TP
-.B \-bpp\ depth
+.B \-bpp\ <depth>
 use different color depth than autodetect. Not all -vo drivers support
 it (fbdev, dga2, svga, vesa).
 .TP
-.B \-abs\ bytes
+.B \-pp\ quality
+apply postprocess filter on decoded image.
+Postprocessing effect depends on the codec and works only for MPEG, OpenDivX,
+DivX4, DivX. Quality is an hexadecimal number built as below:
+      
+0x 00 TX hv YZ
+      ^^ ^^ ^^
+      ||  | ||
+      ||  | |\- postprocessing flag for luminance:
+      ||  | |   1/2: v/h deblock  4: dering  8: auto contrast/brightness
+correction
+      ||  | |
+      ||  | \-- postproc flags for color:
+      ||  |     1/2: v/h deblock  4: dering
+      ||  |
+      ||  \---- experimental deblocking filters:
+      ||        11: X's filter 22: x1 filter
+      ||
+      |\------- deinterlacing modes
+      |         1: linear interpolation  2: linear blend
+      |         4: cubic interpolation   8: median
+      |
+      \-------- temporal denoise filter: 1 enabled
+      
+.I HINT:
+0x2007f or 0x7f are known to give good results.
+
+.I NOTE:
+0x20000 (deinterlacing) may be required for DVD playback 
+.TP
+.B \-npp\ <options>
+Options is a comma separated list of the keywords below:
+    hb or hdeblock       : TODO
+    vb or vdeblock       : TODO
+    vr or rkvdeblock     : TODO
+    h1 or x1hdeblock     : TODO
+    v1 or x1vdeblock     : TODO
+    dr or dering         : TODO
+    al or autolevels     : TODO
+    lb or linblenddeint  : linear blend deinterlacing (0x20000)
+    li or linipoldeint   : linear interpolation deinterlacing (0x10000)
+    ci or cubicipoldeint : cubic interpolation deinterlacing (0x40000)
+    md or mediandeint    : median deinterlacing (0x80000)
+    tn or tmpnoise       : temporal denoise filter (0x100000)
+
+.I EXAMPLES:
+ '-pp 0x2007f' <=> '-npp hb,vb,dr,al,lb'
+ '-pp 0x7f'    <=> '-npp hb,vb,dr,al'
+
+.I HINT:
+the following values are known to give good results:
+-npp default -autoq 6 and -npp tn:150:200:400 for the denoiser
+.TP
+.B \-slave
+This option switches on slave mode. This is intended for use
+of MPlayer as a backend to other programs. Instead of intercepting keyboard
+events, MPlayer will read simplistic command lines from its stdin.
+See section
+.B SLAVE MODE PROTOCOL
+for the syntax.
+.TP
+.B \-abs\ <bytes>
 sound card audio buffer size (in bytes, default: measuring)
 .TP
-.B \-delay\ secs
+.B \-delay\ <secs>
 audio delay in seconds (may be +/- float value)
 .TP
 .B \-nobps
 don't use avg. byte/sec value for A-V sync (AVI)
 .TP
-.B \-aid\ id
+.B \-aid\ <id>
 select audio channel [MPG: 0-31 AVI: 1-99 ASF: 0-127 VOB: 128-...]
 .TP
-.B \-alang\ audio\ stream\ language
-Used when playing DVD disks. Expects a two-letter country code(s) as
-parameter, and always tries to play back audio streams those language
-matches the given code. For example: -alang hu,us will always try to play
-hungarian or if it's non-existant then english audio streams if there are any.
-.TP
-.B \-vid\ id
+.B \-vid\ <id>
 select video channel [MPG: 0-15  AVI:  -- ]
 .TP
-.B \-fps\ value
-force frame rate (if value is wrong in the header)
+.B \-fps\ <value>
+force frame rate (if value is wrong in the header) (float number)
 .TP
-.B \-mc\ seconds/5frame
+.B \-mc\ <seconds/5frame>
 maximum sync correction per 5 frames (in seconds)
 .TP
 .B \-ni
-force usage of non-interleaved AVI parser
+force usage of non-interleaved AVI parser (fixes playing
+of some bad AVI files)
 .TP
 .B \-include configfile
 specify config file to be parsed after the default
@@ -428,11 +491,11 @@ indexes.
 .B \-nodshow
 disables usage of DirectShow video codecs
 .TP
-.B \-noxv
-disable XVideo hardware acceleration (with SDL only!)
+.B \-noxv (SDL only)
+disable XVideo hardware acceleration
 .TP
-.B \-forcexv
-force using XVideo (SDL!)
+.B \-forcexv (SDL only)
+force using XVideo
 .TP
 .B \-dumpaudio
 writes audio stream of the file to ./stream.dump (mostly usable
@@ -450,12 +513,9 @@ sync (default)
 frame dropping : decode all frames, video may skip
 .TP
 .B \-nodouble
-disable doublebuffering (default). Currently this is only honoured by the Xv and the DGA driver.
+disables doublebuffering.
 With the DGA driver this also disables OSD support but yields some speed gain.
 .TP
-.B \-double
-enable doublebuffering. Currently this is only honoured by the Xv and the DGA driver.
-.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 -dvd option!)
@@ -476,16 +536,20 @@ select number of audio output channels to be used
 
 Currently this option is only honoured for AC3 audio.
 .TP
-.B \-srate Hz
+.B \-srate <Hz>
 specifies Hz to playback audio on. Has effect on playback speed!
 .TP
-.B \-config configfile
+.B \-config <config\ file>
 specifies where to search for config file
 .TP
-.B \-display name
+.B \-display <name>
 specify the hostname and display number of the X server you want
 to display on. For example : -display xtest.localdomain:0
 .TP
+.B \-wid\ <window\ id>
+This tells MPlayer to use a X11 window, which is useful to embed MPlayer in a
+browser (with the plugger extension for instance)
+.IP
 .B \-unicode
 tells MPlayer to handle the subtitle file as UNICODE.
 Contrary: -nounicode
@@ -508,21 +572,26 @@ value between 0 and 7.
 .B \-frames\ number
 MPlayer plays <number> frames, then quits.
 .TP
-.B \-fb\ device
+.B \-fb\ <device> (FBdev or DirectFB only)
 Specifies the framebuffer device to use. By default it uses /dev/fb0 .
-Only valid for the fbdev driver.
 .TP
-.B \-fbmode\ modename
+.B \-fbmode\ <modename> (FBdev only)
 Change videomode to the one that is labelled as <modename> in /etc/fb.modes .
-Only valid for the fbdev driver.
 .TP
 .I NOTE
 VESA framebuffer doesn't support mode changing.
 .TP
-.B \-fbmodeconfig\ filename
+.B \-fbmodeconfig\ <filename> (FBdev only)
 Use this config file instead of the default /etc/fb.modes .
 Only valid for the fbdev driver.
 .TP
+.B \-monitor_hfreq <horizontal frequency range>  (FBdev only)
+.TP
+.B \-monitor_vfreq <vertical frequency range>  (FBdev only)
+.TP
+.B \-monitor_dotclock <dotclock\ (or\ pixelclock) range>  (FBdev only)
+Look into etc/example.conf for further information and in DOC/video.html.
+.TP
 .B \-subcp\ codepage
 If your system supports iconv(3), you can use this option to
 specify codepage of the subtitle. Examples:
@@ -535,18 +604,18 @@ specify codepage of the subtitle. Examples:
 Convert the given subtitle (specified with the -sub switch) to MPlayer's
 subtitle format, MPsub. Dumps a dump.mpsub file to current directory.
 .TP
-.B \-screenw\ pixels
+.B \-screenw\ <pixels>
 If you use an output driver which can't know the resolution of the screen
 (mga/fbdev/x11 and/or TVout) this is where you can specify the horizontal
 resolution.
 .TP
-.B \-screenh\ pixels
+.B \-screenh\ <pixels>
 If you use an output driver which can't know the resolution of the screen
 (mga/fbdev/x11 and/or TVout) this is where you can specify the vertical
 resolution.
 .TP
-.B \-cache\ kbytes
-This option specifies how much memory to use when precaching a file/URL .
+.B \-cache\ <kbytes>
+This option specifies how much memory to use when precaching a file/URL.
 Especially useful on slow media. Default is off.
 .IP
 .SH "ALPHA/BETA CODE"
@@ -556,19 +625,6 @@ These are included in this manpage just for completeness! These may or may NOT
 work! If you don't know what are these, you DON'T need these! In either case,
 double-check the documentation !
 .TP
-.B \-br\ rate
-used with '-vo odivx' .
-Specifies the bitrate to encode OpenDivx at
-(in bits! e.g: 780000).
-.TP
-.I NOTE
-You CAN'T encode sound, only video right now! Don't ask for it,
-it's on the TODO list.
-.TP
-.B \-encode\ file
-used with '-vo odivx' .
-Specifies the output OpenDivX file. Won't overwrite.
-.TP
 .B \-dumpvideo
 dump video stream to ./stream.dump (only with MPEG-PS) (not very usable)
 .IP
@@ -621,7 +677,7 @@ seek <NUM>      continue at second NUM
 
 skip <NUM>      skip NUM seconds (may be negative)
 
-quit            exit mplayer
+quit            exit MPlayer
 
 .IP
 .SH FILES AND DIRECTORIES