merging mplayer+mencodre manpage, reorganized by section, updated by Jonas Jermann <jjermann@gmx.net>

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

2 files changed, 988 insertions, 1018 deletions

diff --git a/DOCS/mencoder.1 b/DOCS/mencoder.1
deleted file mode 100644
index 7572f114fd..0000000000
--- a/DOCS/mencoder.1
+++ /dev/null
@@ -1,442 +0,0 @@
-.\" MEncoder (C) 2000-2002 Arpad Gereoffy <sendmail@to.mplayer-users>
-.\" This manpage was/is done by Gabucino
-.\"
-.TH "MEncoder" "1" "2002-05-03"
-
-.SH NAME
-mencoder \- Movie Encoder for Linux
-
-.SH "SYNOPSIS"
-.B mencoder
-.RB [options]\ [\fIfile\fP\ |\ \fIURL\fP\ |\ \fIplaylist\fP\ |\ \-\ ]\ [\-o\ file]
-.BR
-.B mencoder
-.RB [global\ options]\ \fIfile1\fP\ [specific\ options]\ [file2]\ [specific\ options]\ [\-o\ file]
-.BR
-.B mencoder
-.RB [global\ options]\ {\fIgroup\ of\ files\ and\ options\fP}\ [group\ specific\ options]\ [\-o\ file]
-.BR
-.B mencoder
-.RB [dvd|vcd|tv]://[title]\ [options]\ [\-o\ file]
-.BR
-.B mencoder
-.RB [mms|http]://URL[:port]\ [options]\ [\-o\ file]
-
-.SH DESCRIPTION
-.B mencoder
-MEncoder (MPlayer's Movie Encoder) is a simple movie encoder, designed to
-encode MPlayer-playable movies (AVI/DVD/VCD/VOB/MPG/MOV/VIV/VIV/FLI/RM/NUV/NET)
-to other MPlayer-playable formats (see below).  It encodes to DivX4 
-(1, 2 or 3 passes), xvid, codecs of libavcodec, PCM/MP3/VBRMP3 audio. 
-Also has stream copying abilities, a powerfull plugin system
-(crop, expand, flip, postprocess, rotate, scale, rgb/yuv conversion) and more.
-
-.SH "OPTIONS"
-.I NOTE
-Every "flag" option has "noflag" pair, e.g. -flag opposite is -noflag
-.BR
-.I NOTE
-CHECK THE HTML DOCUMENTATION TOO!
-.BR
-.I NOTE
-As MEncoder uses the same 'libmpdemux' as MPlayer, their options are
-_sometimes the same_! So although for example the -sid option isn't
-mentioned here, you can use it in MEncoder too! (for encoding DVD with
-subtitles)
-.TP
-.B \-ac3file <filename>
-.TP
-.B \-ac <codec name>
-Use specified codec (according to codecs.conf) for decoding input audio
-stream.
-.TP
-.B \-afm <codec family>
-Force decoding by using a specific codec FAMILY, and FALLBACK to default
-if failed.  For examples see MPlayer manpage.
-.TP
-.B \-aid <stream id>
-If the source media contains multiple audio streams (for example DVDs), encode
-the specified one.
-.TP
-.B \-audiofile <filename>
-Copy audio from external file.
-.TP
-.B \-chapter <chapter id>
-Use with -dvd option (see above). Start encoding at the specified chapter.
-.TP
-.B \-divx4opts <options>
-If encoding to DivX4, you can specify its parameters here, like:
-
-  -divx4opts br=1800:deinterlace:key=250
-
-Available options:
-
-  help              get help
-  br=<value>        specify bitrate in
-                    kbit <4\-16000> or
-                    bit  <16001\-24000000>
-  key=<value>       maximum keyframe interval
-                    (in frames)
-  deinterlace       enable deinterlacing
-                    (don't use, DivX4 is buggy!)
-  q=<value>         quality (1\-fastest, 5\-best)
-  min_quant=<value> minimum quantizer (0\-32)
-  max_quant=<value> maximum quantizer (0\-32)
-  rc_period=<value> rate control period
-  rc_reaction_period=<value> 
-                    rate control reaction period
-  rc_reaction_ratio=<value> 
-                    rate control reaction ratio
-  crispness=<value> (0\-100)
-.TP
-.B \-dvd <title id>
-Encode the specified DVD title.
-.TP
-.B \-dvdangle <angle id>
-Use with -dvd option (see above), and if the DVD disc has multiple angles.
-It will encode the angle specified here.
-.TP
-.B \-dvdkey <CSS key>
-Used to decrypt CSS-encrypted streams on hard disk (with given CSS decrypt
-key).
-.TP
-.B \-endpos <time>
-Stop encoding at given time. Can be specified in many was :
-
-    -endpos 56       encode only 56 seconds
-    -endpos 01:10:00 encode only 1 hours
-
-Can be used in conjuction with -ss!
-.TP
-.B \-ffourcc fourcc
-Can be used to force the video fourcc of the output file. For example -ffourcc
-div3 will have the output file contain "div3" as video fourcc.
-.TP
-.B \-frames <number>
-Encode only given number of frames.
-.TP
-.B \-include
-Specify config file to be parsed after the default
-.TP
-.B \-lameopts <options>
-If encoding to MP3 with libmp3lame, you can specify its parameters here, like:
-
-  -lameopts br=192:cbr
-
-Available options:
-
-    help            get help
-    vbr=<value>     variable bitrate method
-                      0=cbr
-                      1=mt
-                      2=rh(default)
-                      3=abr
-                      4=mtrh
-    abr             average bitrate
-    cbr             constant bitrate
-    br=<value>      specify bitrate in
-                    kbit <0-1024>
-                    (only for CBR and ABR)
-    q=<value>       Quality
-                    (0-highest, 9-low)
-                    (for VBR)
-    aq=<value>      ?
-    ratio=<value>   compression ratio <1-100>
-    vol=<value>     set audio input gain <0-10>
-    mode=<value>    0=stereo
-                    1=joint-stereo
-                    2=dualchannel
-                    3=mono
-                    (default: auto)
-    padding=<value> 0=no
-                    1=all
-                    2=adjust
-.TP
-.B \-lavcopts <options>
-If encoding with a codec from libavcodec, you can specify its parameters here,
-like:
-
-  -lavcopts vcodec=msmpeg4:vbitrate=1800:vhq:keyint=250
-
-Available options:
-
-  help             get help
-
-  vcodec=<value>   use the specified codec :
-                     mjpeg - Motion JPEG
-                     h263 - H263
-                     h263p - H263 Plus
-                     mpeg4 - DivX 4/5
-                     msmpeg4 - DivX 3
-                     rv10 - an old RealVideo codec
-                     mpeg1video - MPEG1 video :)
-                   There's no default, you must
-                   specify it.
-
-  vbitrate=<value> specify bitrate in
-                   kbit <4-16000> or
-                   bit  <16001-24000000>
-                   (warning: 1kbit = 1000 bits)
-                   default = 800k
-
-  vratetol=<value> approximated *filesize* tolerance
-                   in kbits.
-                   (warning: 1kbit = 1000 bits)
-                   default = 1024*8 kbits = 1MByte
-
-  keyint=<value>    interval between keyframes
-                   (specify in frames, >300 are not
-                   recommended)
-                   default = 250 (one key frame every
-                   ten seconds in a 25fps movie)
-
-  vhq              high quality mode, macro blocks
-                   will be encoded multiple times and
-                   the smallest will be used.
-                   default = HQ disabled
-
-  vme=<value>      [0..5] motion estimation method :
-                     0 - no ME at all
-                     1 - ME_FULL
-                     2 - ME_LOG
-                     3 - ME_PHODS
-                     4 - ME_EPZS
-                     5 - ME_X1
-                   EPZS usually gives best results,
-                   but you can try X1 too. FULL is
-                   very slow and the others are
-                   experimental.
-                   default = EPZS
-
-  vqcomp=<value>   if the value is set to 1.0, the
-                   quantizer will stay nearly
-                   constant (high motion scenes will
-                   look bad). If it's 0.0, the
-                   quantizer will be changed
-                   to make all frames approximately
-                   equally sized (low motion scenes
-                   will look bad).
-                   default = 0.5
-
-  vqblur=<value>   blurs the quantizer graph over
-                   time.
-                      0.0 : no blur
-                      1.0 : average all past
-                            quantizers
-                   default = 0.5
-
-  vqscale=<value>  [2..31] gives each frame the same
-                   quantizer (selects fixed quantizer
-                   mode).
-                   default = 0 (fixed quantizer mode
-                   disabled)
-
-  vrc_strategy=<value>
-                   [0..2] different strategies to
-                   decide which frames should get
-                   which quantizer.
-                   default = 2
-
-  v4mv             4 motion vectors per macroblock,
-                   may gives you slightly better
-                   quality, can only be used in HQ
-                   mode and is buggy with B frames
-                   currently.
-                   default = disabled
-
-  vpass=<value>    [1,2] select internal first pass
-                   or second pass of 2-pass mode.
-                   default = 0 (1-pass mode)
-
-The next 3 options apply only to I & P frames :
-
-  vqmin=<value>    [1..31] minimum quantizer,
-                   default = 3
-
-  vqmax=<value>    [1..31] maximum quantizer
-                   default = 15
-
-  vqdiff=<value>   [1..31] quantizer difference.
-                   Limits the maximum quantizer
-                   difference between frames.
-                   default = 3
-
-The following options apply only to B frames :
-
-  vmax_b_frames=<value>
-                   [0..4] maximum number of frames
-                   between each I/P frame.
-                   default = 0 (B-frames generation
-                   disabled)
-
-  vb_strategy=<value>
-                   strategy to choose between
-                   I/P/B frames :
-                     0 allways use max B
-                     1 avoid B frames in high
-                       motion / scene change (can
-                       lead to filesize miss
-                       prediction)
-                   default = 0
-
-  vb_qfactor=XXX   quantizer factor between b
-                   and i/p frames (larger means
-                   higher quantizer for b frames)
-                   default = 2.0
-
-In fixed quantizer mode you can use those options :
-  vqscale, vmax_b_frames, vhq, vme, keyint
-
-You can use the following options only in pass 1 of 2-pass mode or in 1-pass mode :
-  vqblur, vqdiff
-
-You can use the following options only in pass 2 of 2-pass mode :
-  vrc_strategy, vb_strategy
-
-All other options can be used in all modes.
-.TP
-.B \-mc\ <seconds/frame>
-Maximum sync correction per frame (in seconds).
-Use -mc 0 to disable input A/V sync.
-.TP
-.B \-mf <multifile options>
-Used when encoding from multiple JPEG files.
-Its sub-options are:
-
-  on             turns on multifile support
-  w=<value>      width of the output file [autodetected]
-  h=<value>      height of the output file [autodetected]
-  fps=<value>    fps of the output file [default: 25fps]
-  type=<value>   type of input files (jpeg, png)
-.TP
-.B \-nobps
-Used only for AVIs. Doesn't use the bps value in the AVI header, instead
-calculates it.
-.TP
-.B \-nosound
-Encode only video, no audio stream.
-.TP
-.B \-o <filename>
-Outputs to the given filename, instead of the default 'test.avi'.
-.TP
-.B \-oac <codec name>
-Encode with the given codec (codec names are from codecs.conf,
-use -ovc help to get a list of available codecs).
-Examples:
-
-  -oac copy      no encoding, just streamcopy
-  -oac pcm       encode to uncompressed PCM
-  -oac mp3lame   encode to MP3 (using Lame)
-.TP
-.B \-ofps <fps>
-The output file will have different frame/sec than the source.
-You MUST set it for variable fps (asf, some mov) and progressive
-(29.97fps telecined mpeg) files.
-.TP
-.B \-ovc <codec name>
-Encode with the given codec (codec names are from codecs.conf, 
-use -ovc help to get a list of available codecs).
-Examples:
-
-  -ovc copy      no encoding, just streamcopy
-  -ovc divx4     encode to DivX4/DivX5 or XviD
-  -ovc rawrgb    encode to uncompressed RGB24
-  -ovc lavc      encode with a libavcodec codec
-.TP
-.B \-pass <1/2>
-With this you can encode 2pass DivX4 files. First encode with -pass 1, then
-with the same parameters, encode with -pass 2.
-NOTE: for libavcodec 2-pass use -lavcopts vpass=1/2 instead of -pass 1/2
-.TP
-.B \-passlogfile <filename>
-When encoding in 2pass mode, MEncoder dumps first pass' informations
-to the given file instead of the default divx2pass.log.
-.TP
-.B \-pp <value>
-See man mplayer.
-.TP
-.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
-
-Can start only from keyframes!
-.TP
-.B \-sub <filename>
-Given VOBsub/text subtitle will be encoded INTO the output file. Text
-subtitles need fonts properly installed.
-.TP
-.B \-sws <software scaler type>
-Type of scaling method (use with -vop scale=w:h)
-
-    0   fast bilinear (default)
-    1   bilinear
-    2   bicubic (best quality)
-    3   ?
-    4   nearest neighbor (bad quality)
-    5   area averageing scaling support
-.TP
-.B \-v, \-\-verbose
-Increase verbosity.
-.TP
-.B \-vc <codec name>
-Use specified codec (according to codecs.conf) for decoding input video
-stream.
-.TP
-.B \-vcd <track>
-Encode the specified VCD track.
-.TP
-.B \-vfm <codec family>
-Force decoding by using a specific codec FAMILY, and FALLBACK to default
-if failed.  For examples see MPlayer manpage.
-.TP
-.B \-vid <stream id>
-If the source media contains multiple video streams, encode the specified one.
-
-.SH "EXAMPLES"
-.B Encoding DVD title #2
-mencoder -dvd 2 -o title2.avi
-.TP
-.B Encoding DVD title #2, only selected chapters
-mencoder -dvd 2 -chapter 10-15 -o title2.avi
-.TP
-.B The same, but with libavcodec family, MJPEG compression
-mencoder -dvd 2 -o title2.avi -ovc lavc -lavcopts vcodec=mjpeg -ffourcc mjpg
-.TP
-.B Encoding all *.jpg files in the current dir
-mencoder \*.jpg -mf on:w=800:h=600:fps=25 -o output.avi
-.TP
-.B Encoding from HTTP
-mencoder http://mplayer.hq/example.avi -o example.avi
-.TP
-.B Encoding from tuner (see documentation!)
-mencoder -tv on:driver=v4l:width=640:height=480 -o tv.avi
-.TP
-.B Encoding from a pipe
-rar p test-SVCD.rar | mencoder -divx4opts br=800 -ofps 24 -pass 1 -- -
-.TP
-.B Encoding multiple *.vob files
-cat *.vob | mencoder <options> -
-  
-.SH BUGS
-Probably. PLEASE, double-check the documentation (especially bugreports.html),
-the FAQ and the mail archive before!
-
-Send your complete bugreports to the MPlayer-users mailing list at
-<mplayer-users@mplayerhq.hu>. We love complete bugreports :)
-
-.SH AUTHORS
-Check documentation!
-
-MPlayer is (C) 2000\-2002
-.I Arpad Gereoffy <sendmail@to.mplayer-users>
-
-This manpage is written and maintained by
-.I Gabucino <sendmail@to.mplayer\-users>.
-
-.SH STANDARD DISCLAIMER
-Use only at your own risk! There may be errors and inaccuracies that could 
-be damaging to your system or your eye. Proceed with caution, and although
-this is highly unlikely, the author doesn't take any responsibility for that!
-.\" end of file
diff --git a/DOCS/mplayer.1 b/DOCS/mplayer.1
index 5b6acaf780..3e7dd89819 100644
--- a/DOCS/mplayer.1
+++ b/DOCS/mplayer.1
@@ -1,10 +1,13 @@
 .\" MPlayer (C) 2000-2002 Arpad Gereoffy <sendmail@to.mplayer-users>
-.\" This manpage was/is done by Gabucino
+.\" This manpage was/is done by Gabucino <sendmail@to.mplayer-users>
+.\" (Patches done by Jonas Jermann <sendmail@to.mplayer-users>)
 .\" 
-.TH "MPlayer" "1" "2002-05-03"
+.TH "MPlayer" "1" "2002-05-04"
 
 .SH "NAME"
 mplayer \- Movie Player for Linux
+.br
+mencoder \- Movie Encoder for Linux
 
 .SH "SYNOPSIS"
 .B mplayer
@@ -20,12 +23,18 @@ mplayer \- Movie Player for Linux
 .RB [dvd|vcd|tv]://[title]\ [options]
 .br
 .B mplayer
-.RB [mms|http]://URL[:port]\ [options]
+.RB [mms|http|http_proxy|ftp]://URL[:port]\ [options]
+.br
+.B mencoder
+.RB [options]\ [\fIfile\fP\ |\ \fIURL\fP\ |\ \fIplaylist\fP\ |\ \-\ ]\ [\-o\ file]
+.br
+.B gmplayer
+.RB [options]\ [\-skin\ skin]
 
 .SH "DESCRIPTION"
 .B mplayer
 is a movie player for LINUX (runs on many other Unices, and non\-x86
-CPUs, see section 6). It plays most MPEG, VOB, AVI, VIVO, ASF/WMV, QT/MOV, FLI,
+CPUs, see DOCS section 6). It plays most MPEG, VOB, AVI, VIVO, ASF/WMV, QT/MOV, FLI,
 RM, NuppelVideo, yuv4mpeg, FILM, RoQ files, supported by many native, XAnim, and
 Win32 DLL codecs. You can watch VideoCD, SVCD, DVD, 3ivx, DivX 3/4/5 and even WMV movies too
 (and you don't need the avifile library at all!).
@@ -44,228 +53,162 @@ etc), cyrillic, korean fonts are supported (10 supported subtitle formats: Micro
 SubViewer, SAMI (smi), vplayer, RealMedia RT, ssa (Sub Station Alpha), AQT, VobSub, and our 
 own: MPsub).
 
-.SH "GUI OPTIONS"
-.I NOTE:
-The GUI code has to be compiled in *explicitly* (see documentation).
-.br
-.I NOTE:
-The GUI code is STILL exterimental, it is under heavy development, parts of it (for example: playlist) not yet implemented.
-.TP 
-.B \-gui
-Start MPlayer in GUI mode.
-.TP 
-.B \-skin <skin\ directory>
-Load skin from this directory (WITHOUT path name!). For example '\-skin fittyfene' tries these:
+.B mencoder
+(MPlayer's Movie Encoder) is a simple movie encoder, designed to
+encode MPlayer-playable movies (AVI/DVD/VCD/VOB/MPG/MOV/VIV/VIV/FLI/RM/NUV/NET)
+to other MPlayer-playable formats (see below).  It encodes to DivX4 
+(1, 2 or 3 passes), xvid, codecs of libavcodec, PCM/MP3/VBRMP3 audio. 
+Also has stream copying abilities, a powerfull plugin system
+(crop, expand, flip, postprocess, rotate, scale, rgb/yuv conversion) and more.
 
-    /usr/local/share/mplayer/Skin/fittyfene
-    ~/.mplayer/Skin/fittyfene
+.B gmplayer
+is MPlayer with a graphical user interface.
+It has the same options as MPlayer.
 
-.SH "DVD OPTIONS"
-.I NOTE:
-These options are valid only with DVD support compiled in (see documentation).
+.SH GENERAL NOTES
+Every "flag" option has "noflag" pair, e.g. \-fs opposite is \-nofs.
+.br
+.B Check the html documentation too!
+
+.SH "DEMUXER/STREAM OPTIONS"
+.TP
+.B \-aid <id>
+Select audio channel [MPG: 0\-31 AVI: 1\-99 ASF: 0\-127 VOB: 128\-...]
 .br
 .I NOTE:
-DVD playback sometimes requires deinterlacing: see '\-pp 0x20000' or '\-npp lb' options.
-.TP 
-.B \-alang\ <audio\ stream\ language>
+Use \-alang to define the language by name.
+.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,en will always try to play
 hungarian or if it's non\-existant then english audio streams if there are any.
-.TP 
-.B \-chapter\ <chapter\ id>[-<end chapter id>]
+.TP
+.B \-audio\-demuxer <number>
+Force audio demuxer type for \-audiofile. 
+Give the demuxer ID as defined in demuxers.h.
+.TP
+.B \-audiofile <filename>
+Play audio from an external file (WAV, MP3 or Vorbis)
+.TP
+.B \-cdrom\-device <path\ to\ device>
+Override default CDROM drive name /dev/cdrom
+.TP
+.B \-cache <kbytes>
+This option specifies how much memory to use when precaching a file/URL.
+Especially useful on slow media (default is \-nocache).
+.TP
+.B \-chapter <chapter\ id>[-<end chapter id>]
 Specify which chapter to start playing at. Optionally specify which chapter to
 end playing at. Examples can be found below.
-.TP 
+.TP
 .B \-csslib <filename>
 (old-style DVD option) This option is used to override the default location of libcss.so
-.TP 
-.B \-dvd\ <title\ id>
+.TP
+.B \-demuxer <number>
+Force demuxer type. Give the demuxer ID as defined in demuxers.h.
+.TP
+.B \-dumpaudio (MPLAYER only)
+Dumps raw compressed audio stream to ./stream.dump (usefull with mpeg/ac3)
+.TP
+.B \-dumpfile <filename> (MPLAYER only)
+Specify to which file MPlayer should dump to. Should be used together
+with \-dumpaudio/\-dumpvideo/\-dumpstream.
+.TP
+.B \-dumpstream (MPLAYER only)
+Dumps the raw steram to ./stream.dump . Useful for example
+when ripping from DVD or network.
+.TP
+.B \-dumpsub (MPLAYER only)
+Dumps the subtitle substream from VOB streams.
+.TP
+.B \-dumpvideo (MPLAYER only)
+Dump raw compressed video stream to ./stream.dump (not very usable)
+.TP
+.B \-dvd <title\ id>
 Tell MPlayer which movies (marked with titleid) to play. For example
-sometimes '1' are trailers, and '2' is the real movie.
-.TP 
-.B \-dvd\-device\ <path\ to\ device>
+sometimes '1' are trailers, and '2' is the real movie. Sometimes deinterlacing
+is required for DVD playback: see '\-pp 0x20000' or '\-npp lb' options too. 
+.TP
+.B \-dvd\-device <path\ to\ device>
 Override default DVD device name /dev/dvd
-.TP 
-.B \-dvdangle\ <angle\ id>
+.TP
+.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 
+.TP
 .B \-dvdauth <DVD\ device>
 (old-style DVD option) Turns on DVD authentication using the given device.
-.TP 
+.TP
 .B \-dvdkey <CSS\ key>
 (old-style DVD option) When decoding from non-DVD, this option gives the CSS key needed 
 to crack the DVD (the key is printed when authenticating with DVD).
-.TP 
-.B \-dvdnav 
+.TP
+.B \-dvdnav (BETA CODE) 
 Force usage of libdvdnav.
-.TP 
-.B \-sid\ <id>
-Turns on DVD subtitle displaying. Also, you MUST specify a number which
-corresponds to a DVD subtitle language (0\-31). For the list of available
-subtitles, use with the \-v switch and look at the output.
-.br
-.I NOTE:
-Use \-slang to define the subtitle language by name.
-.TP 
-.B \-skipopening
-Skip dvd opening (dvdnav only).
-.TP 
-.B \-slang\ <subtitle\ language>
-See the \-sid option, but this one needs a two\-letter parameter, a country code.
-Like: \-slang hu,en 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.
- 
-.SH "GENERAL OPTIONS"
-.I NOTE:
-Every "flag" option has "noflag" pair, e.g. \-fs opposite is \-nofs
-.TP 
-.B \-ao\ <driver>[:<device>]
-Select audio output driver and optinaly device. "device" is valid with
-SDL too, it means sub\-driver then (for example: \-vo sdl:esd).
-If using OSS, you can specify which sound device to use like this:
-
-    \-ao oss:/dev/dsp1     (replaces the old \-dsp option)
-
-You can get the list of available drivers executing
-.I mplayer \-ao help
-.TP 
-.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
-.TP 
-.B \-audiofile\ <filename>
-Play audio from an external file (WAV, MP3 or Vorbis)
-.TP 
-.B \-autoq\ <quality>
-Dynamically changes the level of postprocess, depending on spare CPU time
-available. The number you specify will be the maximum level used. Usually you
-can use some big number. You may not use together with \-pp but it's ok with
-\-npp!
-.TP 
-.B \-benchmark
-Prints some statistics on CPU usage and dropped frames at the end.
-Used in combination with \-nosound and \-vo null for benchmarking only video codec.
-.TP 
-.B \-cdrom\-device\ <path\ to\ device>
-Override default CDROM drive name /dev/cdrom
-.TP 
-.B \-dr
-Turns on direct rendering (not supported by all codecs and video outputs)
-(default is off).
-.TP 
-.B \-ffactor\ <number>
-Resample alphamap of the font. Can be:
-
-    0    plain white fonts
-    0.75 very narrow black outline [default]
-    1    narrow black outline
-    10   bold black outline
-.TP 
-.B \-font\ <path\ to\ font.desc\ file>
-Search for the OSD/SUB fonts in an alternative directory (default:
-~/.mplayer/font/font.desc). For example:
-
-    \-font ~/.mplayer/arial\-14/font.desc
-.TP 
-.B \-fs
-Fullscreen playing (centers movie, and makes black
-bands around it). Toggle it with the 'f' key (not all video
-outputs support it).
 .TP
-.B \-h, --help
-Show short summary of options
-.TP 
-.B \-ifo <vobsub\ ifo\ file>
-Indicate the file that will be used to load palette and frame size for VOBSUB
-subtitles.
-.TP 
-.B \-lircconf\ <config\ file>
-Specifies a configfile for LIRC (see http://www.lirc.org) if you don't like the default ~/.lircrc
-.TP 
-.B \-loop\ <num>
-Loops movie playback <num> times. 0 means forever.
+.B \-forceidx
+Force rebuilding of INDEX. Useful for files with broken index (desyncs, etc).
+Seeking will be possible. You can fix the index permanently with
+MEncoder (see the documentation).
+.TP
+.B \-fps <value>
+Force frame rate (if value is wrong in the header) (float number)
 .TP
-.B \-mf\ <multifile\ options>
-Used when decoding from multiple PNG or JPEG files. The sub\-options are separated by ":"
+.B \-frames <number>
+MPlayer plays <number> frames, then quits.
+.TP
+.B \-hr\-mp3\-seek
+Hi\-res mp3 seeking. Default is: enabled when playing from external MP3 file,
+as we need to seek to the very exact position to keep A/V sync. It can be slow
+especially when seeking backwards \- it has to rewind to the beginning to find
+the exact frame.
+.TP
+.B \-idx (see \-forceidx option too!)
+Rebuilds INDEX of the AVI if no INDEX was found, 
+thus allowing seeking. Useful with broken/incomplete
+downloads, or badly created AVIs.
+.TP
+.B \-mc <seconds/frame>
+Maximum A-V sync correction per frame (in seconds)
+.TP
+.B \-mf <option1:option2:...>
+Used when decoding from multiple PNG or JPEG files.
 (see documentation). They are:
 
     on            turns on multifile support
-    w=<value>     width of the output
-    h=<value>     height of the output
-    fps=<value>   fps of the output
+    w=<value>     width of the output (autodetect)
+    h=<value>     height of the output (autodetect)
+    fps=<value>   fps of the output (default: 25)
     type=<value>  type of input files (available types : jpeg, png)
-.TP 
-.B \-mixer\ <device>
-This option will tell MPlayer to use a different device for mixing than
-/dev/mixer.
-.TP 
-.B \-monitoraspect <ratio>
-Set aspect ratio of your screen. Examples:
-
-    \-monitoraspect 4:3  or 1.3333
-    \-monitoraspect 16:9 or 1.7777
-.TP 
-.B \-noautosub
-Turns off automatic subtitles
-.TP 
-.B \-nosound
-Don't play sound
-.TP 
-.B \-osdlevel\ <level>
-Specifies which mode the OSD should start in (0: none, 1: seek, 2: seek+timer)
-(default = 2)
-.TP 
-.B \-playlist <file>
-Play files according to this filelist (1 file/row or Winamp or ASX format).
-.TP 
-.B \-quiet
-Display less output, status messages.
-.TP 
-.B \-rootwin
-Play movie in the root window (desktop background) instead of opening
-a new one. Works only with the xv and xmga drivers.
-.TP 
-.B \-ss\ <time> (see \-sb option too!)
+.TP
+.B \-ni
+Force usage of non\-interleaved AVI parser (fixes playing
+of some bad AVI files).
+.TP
+.B \-nobps
+Don't use avg. byte/sec value for A\-V sync (AVI).
+Helps with some AVI files with broken header.
+.TP
+.B \-skipopening
+Skip dvd opening (dvdnav only).
+.TP
+.B \-sb <byte\ position> (see \-ss option too!)
+Seek to byte position. Useful for playback from cdrom 
+images / vob files with junk at the beginning.
+.TP
+.B \-srate <Hz>
+Specifies Hz to playback audio on. Has effect on playback speed!
+.TP
+.B \-ss <time> (see \-sb option too!)
 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 \-sub\ <subtitle\ file>
-Use/display this subtitle file
-.TP 
-.B \-subdelay\ <sec>
-Delays subtitles by <sec> seconds. Can be negative.
-.TP 
-.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 fps as the movie)
-.TP 
-.B \-subpos <0 \- 100>
-Specify the position of subtitles on screen
-.TP 
-.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:
-
-    0   fast bilinear (default)
-    1   bilinear
-    2   bicubic (best quality)
-    3   ?
-    4   nearest neighbor (bad quality)
-    5   area averageing scaling support
-.TP 
-.B \-tv\ <sub\-options>
-This option enables the TV grabbing feature of MPlayer. The sub\-options are separated
-by ":" (see documentation). They are:
+.TP
+.B \-tv <option1:option2:...>
+This option enables the TV grabbing feature of MPlayer (see documentation). 
+Available options are:
 
     on                use TV input
     noaudio           no sound
@@ -279,40 +222,19 @@ by ":" (see documentation). They are:
     norm=<value>      available: PAL, SECAM, NTSC
     channel=<value>   set the tuner to the given channel
     chanlist=<value>  available: us-bcast, us-cable, europe-west, europe-east, etc
-.TP 
-.B \-v
-Enable verbose output (more \-v means more verbosity)
-.TP 
-.B \-vcd\ <track>
+.TP
+.B \-vcd <track>
 Play video cd track from device instead of plain file
-.TP 
-.B \-vm
-Try to change to a different video mode. dga2, x11 (XF86VidMode) and sdl
-output drivers support it.
-.TP 
-.B \-vo\ <driver>[:<device>]
-Select video output driver and optinally device. "device" is valid with
-SDL and GGI too, it means sub\-driver then (for example: \-vo sdl:aalib).
-
-You can get the list of available drivers executing
-.I mplayer \-vo help
 .TP
-.B \-vobsub\ <vobsub\ file\ without\ extention>
-Specify the VobSub files that are to be used for subtitle. This is
-the full pathname without extensions, i.e. without the ".idx", ".ifo"
-or ".sub".
-.TP 
-.B \-vobsubid\ <vobsub\ subtitle\ id>
-Specify the VobSub subtitle id. Valid values range from 0 to 31.
+.B \-vid <id>
+Select video channel [MPG: 0\-15  ASF:  0\-255 ]
+.TP
+.B \-vivo <sub\-options> (DEBUG CODE)
+Force audio parameters for the .vivo demuxer (for debugging purposes)
 
-.SH "ADVANCED OPTIONS"
-.I NOTE:
-These options can help you solve your particular problem (see documentation too!) or help in fine-tuning codec/driver parameters.
+
+.SH "DECODING/FILTERING OPTIONS"
 .TP
-.B \-aa*
-Used for \-vo aa. You can get a list and an explanation of available options executing
-.I mplayer \-aahelp
-.TP 
 .B \-ac <codec name>
 Force usage of a specific audio codec, according to its name in codecs.conf,
 for example:
@@ -325,18 +247,290 @@ for example:
     \-ac ffmp3      use ffmpeg's MP3 decoder (SLOW)
 
 See '\-ac help' for FULL list!
-.TP 
-.B \-aid\ <id>
-Select audio channel [MPG: 0\-31 AVI: 1\-99 ASF: 0\-127 VOB: 128\-...]
+.TP
+.B \-afm <1\-12> (OBSOLETE)
+Force usage of a specific audio format. For example:
+
+    \-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
+    \-afm 5         use aLaw/uLaw driver
+    \-afm 10        use libvorbis
+    \-afm 11        use ffmpeg's MP3 decoder (even mp1)
+
+See \-ac help for FULL list!
+.TP
+.B \-aspect <ratio>
+Override aspect ratio of movies. It's autodetected on MPEG files, but can't be
+autodetected on most AVI files. Examples:
+
+    \-aspect 4:3  or \-aspect 1.3333
+    \-aspect 16:9 or \-aspect 1.7777
+.TP
+.B \-flip
+Flip image upside-down
+.TP
+.B \-nosound
+Don't play/encode sound
+.TP
+.B \-npp <option1,option2,...>
+This option allows to give more litterate options for postprocessing, 
+and is another way of calling it (not with \-pp).
+
+.I EXAMPLE:
+    '\-pp 0x2007f' <=> '\-npp hb,vb,dr,al,lb'
+    '\-pp 0x7f'    <=> '\-npp hb,vb,dr,al'
+
+You can get a list of options for \-npp by executing
+.I mplayer \-npp help
 .br
+These keywords accept a '\-' prefix to disable the option.
+
+.I EXAMPLE:
+    '\-npp de,\-al' means 'default filters without brightness/contrast correction'
+
+A ':' followed by a letter may be appended to the option to indicate its 
+scope:
+    a : automatically switches the filter off if the cpu is too slow
+    c : do chrominance filtering too
+    y : do not do chrominance filtering (that is only luminance filtering)
+
+Each filter defaults to 'c' (chrominance).
+
+.I EXAMPLE:
+    '\-npp de,tn:1:2:3' means 'enable default filters & temporal denoiser'
+    '\-npp hb:y,vb:a \-autoq 6' means 'deblock horizontal only luminance, and
+    automatically switch vertical deblocking on/off depending on available 
+    cpu time'
+.TP
+.B \-pp <quality> (see \-npp option too!)
+Apply postprocess filter on decoded image
+
+Value given by -pp is sent to the codec, if the codec has built-in postprocess
+filter (newer win32 DShow DLLs, divx4linux) otherwise the external postprocess
+filter plugin (-vop pp) is auto-loaded and used. Note, that -npp only works
+with external pp. Also note, that you can use the built-in and external pp at the
+same time, use -pp to set internal pp, and -vop pp=value to set up the external!
+
+The valid range of -pp value for built-in pp filters vary on codecs, mostly
+0-6, where 0=disable 6=slowest/best.
+
+For the external pp filter, this is the numerical mode to use postprocessing. The '\-npp' option described
+below has the same effects but with letters. To have several filters at the
+same time, simply add the hexadecimal values.
+
+.I EXAMPLE:
+The following values are known to give good results:
+    \-pp 0x20000 <=> \-npp lb (deinterlacing \- for DVD/MPEG2 playback e.g.)
+    \-pp 0x7f    <=> \-npp hb,vb,dr,al (smooth the images)
+.TP
+.B \-ssf <mode> (BETA CODE)
+Specifies SwScaler parameters. Available options are:
+
+    lgb=[0..100]   gaussian blur filter (luma) 
+    cgb=[0..100]   gaussian blur filter (chroma)
+    ls=[0..100]    sharpen filter (luma)
+    cs=[0..100]    sharpen filter (chroma)
+    cvs=x          chroma vertival shifting
+    chs=x          chroma horizontal shifting
+.TP
+.B \-stereo <mode>
+Select type of MP2/MP3 stereo output.
+
+    Stereo          0
+    Left channel    1
+    Right channel   2
+.TP
+.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