moved -af options to the filter section (should work with mencoder), split encoding options in general and codec specific part, some small (cosmetic) changes

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

2 files changed, 980 insertions, 768 deletions

diff --git a/DOCS/en/mplayer.1 b/DOCS/en/mplayer.1
index 8fd621cf13..8fb56136dd 100644
--- a/DOCS/en/mplayer.1
+++ b/DOCS/en/mplayer.1
@@ -38,7 +38,7 @@
 .\" Title
 .\" --------------------------------------------------------------------------
 .
-.TH MPlayer 1 "2003-03-22"
+.TH MPlayer 1 "2003-07-05"
 .
 .SH NAME
 mplayer  \- Movie Player for Linux
@@ -504,8 +504,8 @@ This option is considered an entry so options found after it will apply
 only to the elements of this playlist.
 .TP
 .B \-quiet \ \ 
-Don't display the status messages. With this option the status line
-(i.e. A:   0.7 V:   0.6 A-V:  0.068 ...) will not be displayed. It's
+Don't display the status messages.  With this option the status line
+(i.e. A:   0.7 V:   0.6 A-V:  0.068 ...) will not be displayed.  It's
 particulary useful when your terminal does not understand carriage
 return (i.e. \\r) like the XEmacs one.
 .TP
@@ -550,7 +550,7 @@ Useful for slideshows.
 .TP
 .B \-use-stdin
 The standard input (aka. stdin) will be used to read data instead of key
-events. If you open /dev/stdin (or the equivalent on your system), use stdin
+events.  If you open /dev/stdin (or the equivalent on your system), use stdin
 in a playlist or intend to read from stdin later on via the openfile or
 openlist commands you
 .B need
@@ -740,7 +740,7 @@ Play/\:convert only first <number> frames, then quit.
 .B \-hr\-mp3\-seek (MP3 only)
 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
+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
@@ -791,7 +791,7 @@ Helps with some AVI files with broken header.
 Disables filename-extension based demuxer selection.
 By default, when file type (demuxer) cannot be detected reliably
 (the file has no header or it is not reliable enough), the filename
-extension is used to select demuxer. It always falls back to content-based
+extension is used to select demuxer.  It always falls back to content-based
 demuxer selection.
 .TP
 .B \-passwd <password> (see \-user option too)
@@ -886,7 +886,7 @@ seeks to 1\ hour 10\ min
 .
 .TP
 .B \-tv <option1:option2:...>
-This option tunes various properties of tv-capture module. For
+This option tunes various properties of tv-capture module.  For
 watching TV with MPlayer, use 'tv://' or 'tv://<channel_number>' 
 or even 'tv://<channel_name> (see option channels for channel_name below)
 as a movie URL.
@@ -1151,7 +1151,7 @@ Selects Hungarian and falls back to English if Hungarian is not available.
 .
 .TP
 .B \-sub <subtitle\-file1,subtitle\-file2,...>
-Use/\:display these subtitle files. Only one file can be displayed 
+Use/\:display these subtitle files.  Only one file can be displayed 
 at the same time and the files can be switched with 'j'. 
 .TP
 .B \-sub-bg-alpha <0\-255>
@@ -1297,10 +1297,10 @@ Values are the same as for -subalign, with the extra choice -1 for original
 position.
 .TP
 .B \-spuaa <mode>
-Antialiasing/scaling mode for DVD/VobSub. A value of 16 may be added
+Antialiasing/scaling mode for DVD/VobSub.  A value of 16 may be added
 to mode in order to force scaling even when original and scaled frame
 size already match, for example to smooth subtitles with the gaussian
-blur. The available modes are:
+blur.  The available modes are:
 .PD 0
 .RSs
 .IPs 0
@@ -1318,8 +1318,8 @@ uses swscaler gaussian blur (looks very good)
 .
 .TP
 .B \-spugauss <0.0\-3.0>
-Variance parameter of gaussian used by -spuaa 4. Higher means more
-blur. The default is 1.0.
+Variance parameter of gaussian used by -spuaa 4.  Higher means more
+blur.  The default is 1.0.
 
 
 .SH "AUDIO OUTPUT OPTIONS (MPLAYER ONLY)"
@@ -1327,93 +1327,6 @@ blur. The default is 1.0.
 .B \-abs <value> (OBSOLETE)
 Override audio driver/\:card buffer size detection, \-ao oss only
 .TP
-.B \-af <plugin1[=options],plugin2,...>
-Activate a comma separated list of audio filters and their options.
-.br
-Available filters are:
-.
-.RSs
-.IPs resample[=srate[:sloppy][:type]]
-Changes the sample rate of the audio stream to an integer srate (Hz).
-It only supports the 16 bit little endian format.
-.IPs channels[=nch]
-Change the number of channels to nch output channels.
-If the number of output channels is bigger than the number of input channels
-empty channels are inserted (except mixing from mono to stereo, then the mono
-channel is repeated in both of the output channels).
-If the number of output channels is smaller than the number of input channels
-the exceeding channels are truncated.
-.IPs format[=bps,f]
-Select the format f and bits per sample bps used for output from the
-filter layer.
-The option bps is an integer and denotes Bytes per sample.
-The format f is a string containing a concatenated mix of:
-.br
-alaw, mulaw or imaadpcm
-.br
-float or int
-.br
-unsigned or signed
-.br
-le or be (little or big endian)
-.br
-.IPs "volume[=v:sc]"
-Select the output volume level.
-This filter is not reentrant and can therefore only be enabled once for every
-audio stream.
-.RSss
-v: desired gain in dB for all channels in the stream.
-The gain can be set from -200dB to +40dB (where -200dB mutes the sound
-completely and +40dB equals a gain of 1000).
-.br
-sc: enable soft clipping.
-.REss
-.IPs "pan[=n:l01:l02:..l10:l11:l12:...ln0:ln1:ln2:...]"
-Mixes channels arbitrarily, see DOCS/sound.html for details.
-.RSss
-n: number of output channels (1 - 6).
-.br
-lij: how much of input channel j is mixed into output channel i.
-.REss
-.IPs "sub[=fc:ch]"
-Add sub-woofer channel.
-.RSss
-fc: Cutoff frequency for low-pass filter (20Hz to 300Hz) default is 60Hz.
-.br
-ch: channel number for the sub-channel.
-.REss
-.IPs "surround[=d]"
-Decoder for matrix encoded surround sound, works on many 2 channel files.
-.RSss
-d: delay time in ms for the rear speakers (0ms to 1000ms) default is 15ms.
-.REss
-.IPs delay[=ch1:ch2:...]
-Delays the sound output.
-Specify the delay separately for each channel in milliseconds (floating point
-number between 0 and 1000).
-.RE
-.
-.TP
-.B \-af-adv <force=(0\-3):list=(filters)> (see -af option too)
-Specify advanced audio filter options:
-.
-.RSs
-.IPs force=<0-3>
-Forces the insertion of audio filters to one of the following:
-.RSss
-0: Completely automatic insertion of filters (default)
-.br
-1: Optimize for speed
-.br
-2: Optimize for accuracy
-.br
-3: Turn off auto
-.REss
-.IPs list=<filters>
-Same as -af (see -af option).
-.RE
-.
-.TP
 .B \-ao <driver1[:device],driver2,...[,]>
 Specify a priority list of audio output drivers (optionally with device) to be
 used.
@@ -1674,7 +1587,7 @@ Try this option if you still experience fullscreen problems.
 Specify a priority list of fullscreen layer setting modes to be
 used.
 
-The default order is "layer,stays_on_top,above,fullscreen". It will be used
+The default order is "layer,stays_on_top,above,fullscreen".  It will be used
 as a fallback in case of specifying incorrect or unsupported modes.
 .br
 If you experience problems with fullscreen window being covered by other
@@ -1954,6 +1867,93 @@ try other codecs except FFmpeg's MP3 decoder
 .PD 1
 .
 .TP
+.B \-af <plugin1[=options],plugin2,...>
+Activate a comma separated list of audio filters and their options.
+.br
+Available filters are:
+.
+.RSs
+.IPs resample[=srate[:sloppy][:type]]
+Changes the sample rate of the audio stream to an integer srate (Hz).
+It only supports the 16 bit little endian format.
+.IPs channels[=nch]
+Change the number of channels to nch output channels.
+If the number of output channels is bigger than the number of input channels
+empty channels are inserted (except mixing from mono to stereo, then the mono
+channel is repeated in both of the output channels).
+If the number of output channels is smaller than the number of input channels
+the exceeding channels are truncated.
+.IPs format[=bps,f]
+Select the format f and bits per sample bps used for output from the
+filter layer.
+The option bps is an integer and denotes Bytes per sample.
+The format f is a string containing a concatenated mix of:
+.br
+alaw, mulaw or imaadpcm
+.br
+float or int
+.br
+unsigned or signed
+.br
+le or be (little or big endian)
+.br
+.IPs "volume[=v:sc]"
+Select the output volume level.
+This filter is not reentrant and can therefore only be enabled once for every
+audio stream.
+.RSss
+v: desired gain in dB for all channels in the stream.
+The gain can be set from -200dB to +40dB (where -200dB mutes the sound
+completely and +40dB equals a gain of 1000).
+.br
+sc: enable soft clipping.
+.REss
+.IPs "pan[=n:l01:l02:..l10:l11:l12:...ln0:ln1:ln2:...]"
+Mixes channels arbitrarily, see DOCS/sound.html for details.
+.RSss
+n: number of output channels (1 - 6).
+.br
+lij: how much of input channel j is mixed into output channel i.
+.REss
+.IPs "sub[=fc:ch]"
+Add sub-woofer channel.
+.RSss
+fc: Cutoff frequency for low-pass filter (20Hz to 300Hz) default is 60Hz.
+.br
+ch: channel number for the sub-channel.
+.REss
+.IPs "surround[=d]"
+Decoder for matrix encoded surround sound, works on many 2 channel files.
+.RSss
+d: delay time in ms for the rear speakers (0ms to 1000ms) default is 15ms.
+.REss
+.IPs delay[=ch1:ch2:...]
+Delays the sound output.
+Specify the delay separately for each channel in milliseconds (floating point
+number between 0 and 1000).
+.RE
+.
+.TP
+.B \-af-adv <force=(0\-3):list=(filters)> (see -af option too)
+Specify advanced audio filter options:
+.
+.RSs
+.IPs force=<0-3>
+Forces the insertion of audio filters to one of the following:
+.RSss
+0: Completely automatic insertion of filters (default)
+.br
+1: Optimize for speed
+.br
+2: Optimize for accuracy
+.br
+3: Turn off auto
+.REss
+.IPs list=<filters>
+Same as -af (see -af option).
+.RE
+.
+.TP
 .B \-afm <driver1,driver2,...>
 Specify a priority list of audio drivers to be used, according to their driver
 name in codecs.conf.
@@ -2268,7 +2268,7 @@ Could be used to force scaling with \-vf scale.
 
 .SH "VIDEO FILTERS"
 Video filter are plugins that allow you to modify the video stream and its
-properties. The syntax is:
+properties.  The syntax is:
 .TP
 .B \-vf <filter1[=options],filter2,...>
 Setup a chain of video filters.
@@ -2503,7 +2503,7 @@ Fast software YV12 to MPEG1 conversion with libfame for use with DVB/\:DXR3.
 .TP
 .B dvbscale[=aspect]
 Set up optimal scaling for DVB cards, scaling the X axis in hardware and
-calculating the Y axis scaling in software to keep aspect. It's only useful
+calculating the Y axis scaling in software to keep aspect.  It's only useful
 together with expand+scale
 (\-vf dvbscale,scale=-1:0,expand=-1:576:-1:-1:1,lavc).
 .RSs
@@ -2537,7 +2537,7 @@ mix random noise with a (semi)regular pattern
 .B "denoise3d[=luma:chroma:time]"
 This filter aims to reduce image noise producing smooth images and making still
 images really still (This should enhance compressibility.).
-It can be given from 0 to 3 parameters.   If you omit a parameter, a reasonable
+It can be given from 0 to 3 parameters.  If you omit a parameter, a reasonable
 value will be inferred.
 .PD 0
 .RSs
@@ -2566,7 +2566,7 @@ Initial values in the range -100 \- 100 may be given on the command line.
 .B eq2[=gamma:contrast:brightness:saturation:rg:gg:bg]
 Alternative software equalizer that uses lookup tables (very slow),
 allowing gamma correction in addition to simple brightness,
-contrast and saturation adjustment. Note that it uses the same MMX
+contrast and saturation adjustment.  Note that it uses the same MMX
 optimized code as \-vf eq if all gamma values are 1.0.
 The parameters are given as floating point values.
 Parameters rg, gg, bg are the independent gamma values for the Red, Green
@@ -2667,32 +2667,32 @@ swap fields (exchange even & odd lines)
 .TP
 .B "field[=n]"
 Extracts a single field from an interlaced image using stride arithmetic
-to avoid wasting CPU time. The optional argument n specifies whether
+to avoid wasting CPU time.  The optional argument n specifies whether
 to extract the even or the odd field (depending on whether n is even
 or odd).
 .TP
 .B "detc[=var1=value2:var2=value2:...]"
 Attempts to reverse the "telecine" process to recover a clean,
-non-interlaced stream at film framerate. This filter is still
-experimental but seems to be usable. Please be aware that there is
+non-interlaced stream at film framerate.  This filter is still
+experimental but seems to be usable.  Please be aware that there is
 absolutely no use in this filter unless you see interlacing when
 playing the movie! The following arguments (see syntax above) may be
 used to control its behavior:
 .RSs
 .IPs dr
-Set the frame dropping mode. 0 (default) means don't drop frames
-to maintain fixed output framerate. 1 means always drop a frame when
-there have been no drops or telecine merges in the past 5 frames. 2
-means always maintain exact 5:4 input to output frame ratio. (Note:
+Set the frame dropping mode.  0 (default) means don't drop frames
+to maintain fixed output framerate.  1 means always drop a frame when
+there have been no drops or telecine merges in the past 5 frames.  2
+means always maintain exact 5:4 input to output frame ratio.  (Note:
 use mode 1 with MEncoder!)
 .IPs am
-Analysis mode. Available values are 0 (fixed pattern with initial
+Analysis mode.  Available values are 0 (fixed pattern with initial
 frame number specified by fr=#) and 1 (agressive search for telecine
-pattern). Default is 1.
+pattern).  Default is 1.
 .IPs fr
-Set initial frame number in sequence. 0-2 are the three clean
-progressive frames; 3 and 4 are the two interlaced frames. The
-default, -1, means "not in telecine sequence". The number specified
+Set initial frame number in sequence.  0-2 are the three clean
+progressive frames; 3 and 4 are the two interlaced frames.  The
+default, -1, means "not in telecine sequence".  The number specified
 here is the type for the imaginary previous frame before the movie
 starts.
 .IPs tr0, tr1, tr2, tr3
@@ -2712,16 +2712,16 @@ As with detc, you must specify the correct output framerate (-ofps
 23.976) when using mencoder.
 .TP
 .B "telecine[=start]"
-Apply 3:2 "telecine" process to increase framerate by 20%. This most
+Apply 3:2 "telecine" process to increase framerate by 20%.  This most
 likely will not work correctly with mplayer, but it can be used
-with 'mencoder -fps 29.97 -ofps 29.97 -vf telecine'. Both fps options are
-essential! (A/V sync will break if they are wrong.) The optional start
+with 'mencoder -fps 29.97 -ofps 29.97 -vf telecine'.  Both fps options
+are essential! (A/V sync will break if they are wrong.) The optional start
 parameter tells the filter where in the telecine pattern to start
 (0-3).
 .TP
 .B "tfields[=mode]"
 Temporal field separation -- split fields into frames, doubling the
-output framerate. Like the telecine filter, "tfields" will only work
+output framerate.  Like the telecine filter, "tfields" will only work
 properly with mencoder, and only if both -fps and -ofps are set to the
 desired (double) framerate! Available modes are:
 .PD 0
@@ -2877,7 +2877,7 @@ send 1,8MB of RGBA32 data everytime a small part of the screen is updated.
 .PD 1
 
 
-.SH "ENCODING OPTIONS (MENCODER ONLY)"
+.SH "GENERAL ENCODING OPTIONS (MENCODER ONLY)"
 .TP
 .B \-audio-density <1\-50>
 Number of audio chunks per second (default is 2 for 0.5s long audio chunks).
@@ -2895,59 +2895,6 @@ default audio delay, sparing you the use of the \-delay option.
 .B \-audio-preload <0.0\-2.0>
 Sets up audio buffering time interval (default: 0.5s).
 .TP
-.B \-divx4opts <option1:option2:...>
-If encoding to DivX4, you can specify its parameters here.
-.br
-Available options are:
-.
-.RSs
-.IPs help
-get help
-.IPs br=<value>
-specify bitrate in
-.RSss
-kbit <4\-16000> or
-.br
-bit  <16001\-24000000>
-.REss
-.IPs key=<value>
-maximum keyframe interval (in frames)
-.IPs deinterlace
-enable deinterlacing (avoid it, DivX4 is buggy)
-.IPs q=<1\-5>
-quality (1\-fastest, 5\-best)
-.IPs min_quant=<1\-31>
-minimum quantizer
-.IPs max_quant=<1\-31>
-maximum quantizer
-.IPs rc_period=<value>
-rate control period
-.IPs rc_reaction_period=<value>
-rate control reaction period
-.IPs rc_reaction_ratio=<value>
-rate control reaction ratio
-.IPs crispness=<0\-100>
-specify crispness/\:smoothness
-.IPs 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.
-.IPs vbrpass=<0\-2>
-Override the pass argument and use XviD VBR Library instead of DivX4
-VBR.
-Available options are:
-.
-.RSss
-0: one pass encoding (as in not putting pass on the command line)
-.br
-1: Analysis (first) pass of two pass encoding.
-The resulting AVI file can be directed to /dev/null.
-.br
-2: Final (second) pass of two pass encoding.
-.REss
-.RE
-.
-.TP
 .B \-endpos <[[hh:]mm:]ss[.ms]|size[b|kb|mb]> (see \-ss and \-sb option too)
 Stop encoding at given time or byte position.
 Can be specified in many ways:
@@ -3010,196 +2957,405 @@ general comments about the file or the subject of the file
 .RE
 .
 .TP
-.B \-lameopts <option1:option2:...>
-If encoding to MP3 with libmp3lame, you can specify its parameters here.
-.br
-Available options are:
+.B \-noskip
+Do not skip frames.
+.TP
+.B \-o <filename>
+Outputs to the given filename, instead of the default 'test.avi'.
+.TP
+.B \-oac <codec name>
+Encode with the given audio codec.
+Use \-oac help to get a list of available codecs.
+(no default set)
+
+.I EXAMPLE:
+.PD 0
+.RSs
+.IPs "-oac copy"
+no encoding, just streamcopy
+.IPs "-oac pcm"
+encode to uncompressed PCM
+.IPs "-oac mp3lame"
+encode to MP3 (using Lame)
+.RE
+.PD 1
 .
+.TP
+.B \-of <format> (BETA CODE!)
+Encode to the specified format.
+Use \-of help to get a list of available formats.
+
+.I EXAMPLE:
+.PD 0
 .RSs
-.IPs help
+.IPs "-of avi"
+encode to avi (default)
+.IPs "-of mpeg"
+encode to mpeg
+.RE
+.PD 1
+.
+.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 video codec.
+Use \-ovc help to get a list of available codecs.
+(no default set)
+
+.I EXAMPLE:
+.PD 0
+.RSs
+.IPs "\-ovc copy"
+no encoding, just streamcopy
+.IPs "\-ovc divx4"
+encode to DivX4/\:DivX5
+.IPs "\-ovc rawrgb"
+encode to uncompressed RGB24
+.IPs "\-ovc lavc"
+encode with a libavcodec codecs
+.RE
+.PD 1
+.
+.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 \-skiplimit <value>
+Maximal skipable frames after non-skipped one
+(-noskiplimit for unlimited number).
+.TP
+.B \-v, \-verbose
+Increment verbose level (more \-v means more verbosity).
+
+.PD 0
+.RSs
+.IPs 0
+only some informal output (default)
+.IPs 1
+some basic debug infos, avi header, function values (init debug)
+.IPs 2
+print avi indexes, chunk inputs, more debug infos (player debug)
+.IPs 3
+prints everything related to input parsers (parser debug)
+.RE
+.PD 1
+.
+.TP
+.B \-vobsubout <basename>
+Specify the basename for the output .idx and .sub files.
+This turns off subtitle rendering in the encoded movie and diverts it to
+Vobsub subtitle files.
+.TP
+.B \-vobsuboutindex <index>
+Specify the index of the subtitles in the output files.
+(default: 0)
+.TP
+.B \-vobsuboutid <langid>
+Specify the language two letter code for the subtitles.
+This overrides what is read from the DVD or the .ifo file.
+
+
+.SH "CODEC SPECIFIC ENCODING OPTIONS (MENCODER ONLY)"
+You can specify codec specific encoding parameters using the following
+syntax:
+.TP
+.B \-<codec>opts <option1[=value],option2,...>
+.RE
+
+Where <codec> may be: lavc, xvidenc, divx4, lame
+
+
+.SS divx4 (-divx4opts)
+
+.TP
+.B help
 get help
-.IPs vbr=<0\-4>
+.TP
+.B br=<value>
+specify bitrate
+.RSs
+.IPs 4\-16000
+(in kbit)
+.IPs 16001\-24000000
+(in bit)
+.RE
+.TP
+.B key=<value>
+maximum keyframe interval (in frames)
+.TP
+.B deinterlace
+enable deinterlacing (avoid it, DivX4 is buggy)
+.TP
+.B q=<1\-5>
+quality (1\-fastest, 5\-best)
+.TP
+.B min_quant=<1\-31>
+minimum quantizer
+.TP
+.B max_quant=<1\-31>
+maximum quantizer
+.TP
+.B rc_period=<value>
+rate control period
+.TP
+.B rc_reaction_period=<value>
+rate control reaction period
+.TP
+.B rc_reaction_ratio=<value>
+rate control reaction ratio
+.TP
+.B crispness=<0\-100>
+specify crispness/\:smoothness
+.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.
+.TP
+.B vbrpass=<0\-2>
+Override the pass argument and use XviD VBR Library instead of DivX4
+VBR.  Available options are:
+.
+.RSs
+.IPs 0
+one pass encoding (as in not putting pass on the command line)
+.IPs 1
+Analysis (first) pass of two pass encoding.
+The resulting AVI file can be directed to /dev/null.
+.IPs 2
+Final (second) pass of two pass encoding.
+.RE
+
+
+.SS lame (-lameopts)
+
+.TP
+.B help
+get help
+.TP
+.B vbr=<0\-4>
 variable bitrate method
-.RSss
-0: cbr
-.br
-1: mt
-.br
-2: rh (default)
-.br
-3: abr
-.br
-4: mtrh
-.REss
-.IPs abr\ \ 
+.PD 0
+.RSs
+.IPs 0
+cbr
+.IPs 1
+mt
+.IPs 2
+rh (default)
+.IPs 3
+abr
+.IPs 4
+mtrh
+.RE
+.PD 1
+.TP
+.B abr\ \ 
 average bitrate
-.IPs cbr\ \ 
+.TP
+.B cbr\ \ 
 constant bitrate.
 .br
 Forces also CBR mode encoding on subsequent ABR presets modes
-.IPs br=<0\-1024>
+.TP
+.B br=<0\-1024>
 specify bitrate in kBit (CBR and ABR only)
-.IPs q=<0\-9>
+.TP
+.B q=<0\-9>
 quality (0-highest, 9-lowest) (only for VBR)
-.IPs aq=<0\-9>
+.TP
+.B aq=<0\-9>
 algorithmic quality (0-best/\:slowest, 9-worst/\:fastest)
-.IPs ratio=<1\-100>
+.TP
+.B ratio=<1\-100>
 compression ratio
-.IPs vol=<0\-10>
+.TP
+.B vol=<0\-10>
 set audio input gain
-.IPs mode=<0\-3>
+.TP
+.B mode=<0\-3>
 (default: auto)
-.RSss
-0: stereo
-.br
-1: joint-stereo
-.br
-2: dualchannel
-.br
-3: mono
-.REss
-.IPs padding=<0\-2>
-.RSss
-0: no
-.br
-1: all
-.br
-2: adjust
-.REss
-.IPs fast
+.PD 0
+.RSs
+.IPs 0
+stereo
+.IPs 1
+joint-stereo
+.IPs 2
+dualchannel
+.IPs 3
+mono
+.RE
+.PD 1
+.TP
+.B padding=<0\-2>
+.PD 0
+.RSs
+.IPs 0
+no
+.IPs 1
+all
+.IPs 2
+adjust
+.RE
+.PD 1
+.TP
+.B fast
 switch on faster encoding on subsequent VBR presets modes, slightly lower 
 quality and higher bitrates.
-.IPs preset=<value>
+.TP
+.B preset=<value>
 preset values
-.RSss
-medium: VBR encoding, good quality, 150\-180 kbps bitrate range.
-.br
-standard: VBR encoding, high quality, 170\-210 kbps bitrate range.
-.br
-extreme: VBR encoding, very high quality, 200\-240 kbps bitrate range.
-.br
-insane: CBR encoding, highest preset quality, 320 kbps bitrate.
-.br
-<8-320>: ABR encoding at average given kbps bitrate.
-.br
-.REss
+.RSs
+.IPs medium
+VBR encoding, good quality, 150\-180 kbps bitrate range.
+.IPs standard
+VBR encoding, high quality, 170\-210 kbps bitrate range.
+.IPs extreme
+VBR encoding, very high quality, 200\-240 kbps bitrate range.
+.IPs insane
+CBR encoding, highest preset quality, 320 kbps bitrate.
+.IPs <8\-320>
+ABR encoding at average given kbps bitrate.
 .RE
 
+.RS
 .I EXAMPLE:
+.RE
 .PD 0
 .RSs
-.IPs "\-lameopts fast:preset=standard"
+.IPs "fast:preset=standard"
 for most people on most music and already quite high in quality.
-.IPs "\-lameopts  cbr:preset=192"
+.IPs "cbr:preset=192"
 encode with ABR presets at a 192 kbps forced constant bitrate.
-.IPs "\-lameopts      preset=172"
+.IPs "preset=172"
 encode with ABR presets at a 172 kbps average bitrate.
-.IPs "\-lameopts      preset=extreme"
+.IPs "preset=extreme"
 for people with extremely good hearing and similar equipment.
-.IPs "\-lameopts preset=help"
+.IPs "preset=help"
 print additional options and informations on presets settings.
 .RE
 .PD 1
-.
-.TP
-.B \-lavcopts <option1:option2:...>
-If encoding with libavcodec, you can specify its parameters
-here.
+
+
+.SS lavc (-lavcopts)
 
 .I EXAMPLE:
 .PD 0
 .RSs
-\-lavcopts vcodec=msmpeg4:vbitrate=1800:vhq:keyint=250
+.IPs \-lavcopts vcodec=msmpeg4:vbitrate=1800:vhq:keyint=250
 .RE
 .PD 1
 
-.RS
-Available options are:
-.RE
-.
-.RSs
-.IPs vcodec=<value>
+.TP
+.B vcodec=<value>
 use the specified codec (there is no default, you must specify it):
-.RSss
-mjpeg: Motion JPEG
-.br
-h263: H263
-.br
-h263p: H263 Plus
-.br
-mpeg4: DivX 4/\:5
-.br
-msmpeg4: DivX 3
-.br
-msmpeg4v2: MS MPEG4v2
-.br
-wmv1: Windows Media Video 7
-.br
-wmv2: Windows Media Video 8
-.br
-rv10: an old RealVideo codec
-.br
-mpeg1video: MPEG1 video :)
-.br
-huffyuv: HuffYUV
-.REss
-.IPs vqmin=<1\-31>
+.PD 0
+.RSs
+.IPs mjpeg
+Motion JPEG
+.IPs h263
+H263
+.IPs h263p
+H263 Plus
+.IPs mpeg4
+DivX 4/\:5
+.IPs msmpeg4
+DivX 3
+.IPs msmpeg4v2
+MS MPEG4v2
+.IPs wmv1
+Windows Media Video 7
+.IPs wmv2
+Windows Media Video 8
+.IPs rv10
+an old RealVideo codec
+.IPs mpeg1video
+MPEG1 video :)
+.IPs huffyuv
+HuffYUV
+.RE
+.PD 1
+.TP
+.B vqmin=<1\-31>
 minimum quantizer (pass\ 1/\:2)
-.RSss
-1: Not recommended (much larger file, little quality difference and weird side
+.RSs
+.IPs 1
+Not recommended (much larger file, little quality difference and weird side
 effects: msmpeg4, h263 will be very low quality, ratecontrol will be confused
 resulting in lower quality and some decoders will not be able to decode it).
-.br
-2: Recommended for normal mpeg4/mpeg1video encoding (default).
-.br
-3: Recommended for h263(p)/msmpeg4. The reason for preferring 3 over 2 is that
+.IPs 2
+Recommended for normal mpeg4/mpeg1video encoding (default).
+.IPs 3
+Recommended for h263(p)/msmpeg4.  The reason for preferring 3 over 2 is that
 2 could lead to overflows (this will be fixed for h263(p) by changing the
 quantizer per MB in the future, msmpeg4 cannot be fixed as it does not support
-that)
-.REss
-.IPs vqscale=<1\-31>
+that).
+.RE
+.TP
+.B vqscale=<1\-31>
 Constant quantizer /\: constant quality encoding (selects fixed quantizer mode).
 A lower value means better quality but larger files (default: 0 (disabled)).
 1 is not recommended (see \-vqmin for details).
-.IPs vqmax=<1\-31>
+.TP
+.B vqmax=<1\-31>
 maximum quantizer (pass\ 1/\:2) 10\-31 should be a sane range (default: 31)
-.IPs mbqmin=<1\-31>
+.TP
+.B mbqmin=<1\-31>
 minimum macroblock quantizer (pass\ 1/\:2) (default: 2)
-.IPs mbqmax=<1\-31>
+.TP
+.B mbqmax=<1\-31>
 maximum macroblock quantizer (pass\ 1/\:2) (default: 31)
-.IPs vqdiff=<1\-31>
+.TP
+.B vqdiff=<1\-31>
 maximum quantizer difference between I or P frames (pass\ 1/\:2) (default: 3)
-.IPs vmax_b_frames=<0\-4>
+.TP
+.B vmax_b_frames=<0\-4>
 maximum number of B frames between non B frames:
-.RSss
-0: no B frames (default)
-.br
-0\-2: sane range for MPEG4
-.REss
-.IPs vme=<0\-5>
-motion estimation method:
-.RSss
-0: none (very low quality)
-.br
-1: full (slow)
-.br
-2: log (low quality)
-.br
-3: phods (low quality)
-.br
-4: EPZS (default)
-.br
-5: X1 (experimental)
-Note: 0\-3 currently ignores the amount of Bits spent, so quality may be low.
-.REss
-.IPs vhq\ \ 
+.PD 0
+.RSs
+.IPs 0
+no B frames (default)
+.IPs 0\-2
+sane range for MPEG4
+.RE
+.PD 1
+.TP
+.B vme=<0\-5>
+motion estimation method.  Note: 0\-3 currently ignores the amount of Bits
+spent, so quality may be low.  Available methods are:
+.PD 0
+.RSs
+.IPs 0
+none (very low quality)
+.IPs 1
+full (slow)
+.IPs 2
+log (low quality)
+.IPs 3
+phods (low quality)
+.IPs 4
+EPZS (default)
+.IPs 5
+X1 (experimental)
+.RE
+.PD 1
+.TP
+.B vhq\ \ 
 high quality mode, encode each macro block in all modes and choose the best.
 This is slow but results in better quality and file size.
 (default: disabled)
-.IPs v4mv
+.TP
+.B v4mv
 Allow 4 motion vectors per macroblock (slightly better quality).
 (default: disabled)
-.IPs keyint=<0\-300>
+.TP
+.B keyint=<0\-300>
 maximum interval between keyframes in frames.
 Keyframes are needed for seeking as seeking is only possible to a keyframe but
 keyframes need more space than other frames so larger numbers here mean
@@ -3208,74 +3364,98 @@ Values >300 are not recommended as the quality might be bad depending upon
 decoder, encoder and luck.
 For a strict MPEG1/\:2/\:4 compliance this would have to be <=132.
 (default: 250 or one key frame every ten seconds in a 25fps movie)
-.IPs vb_strategy=<0\-1>
+.TP
+.B vb_strategy=<0\-1>
 strategy to choose between I/\:P/\:B frames (pass\ 2):
-.RSss
-0: always use the maximum number of B frames (default)
-.br
-1: avoid B frames in high motion scenes (will cause bitrate misprediction)
-.REss
-.IPs vpass=<1\-2>
+.RSs
+.IPs 0
+always use the maximum number of B frames (default)
+.IPs 1
+avoid B frames in high motion scenes (will cause bitrate misprediction)
+.RE
+.TP
+.B vpass=<1\-2>
 Activates internal two pass mode, only specify if you wish to use two pass
 encoding (default: disabled).
-.RSss
-1: first pass
-.br
-2: second pass
-.REss
-.IPs
-Tip: Try to use constant quantizer mode for pass one (vqscale=<quantizer>).
-.br
+.PD 0
+.RSs
+.IPs 1
+first pass
+.IPs 2
+second pass
+.RE
+.PD 1
+
+.RS
 huffyuv:
-.RSss
-pass 1 saves statistics
-.br
-pass 2 encodes with an optimal Huffman table based upon pass 1 statistics.
-.REss
-.IPs aspect=<x/y>
+.RE
+.PD 0
+.RSs
+.IPs "pass 1"
+saves statistics
+.IPs "pass 2"
+encodes with an optimal Huffman table based upon pass 1 statistics.
+.RE
+.PD 1
+.TP
+.B aspect=<x/y>
 Store movie aspect internally, just like MPEG files.
 Much nicer solution than rescaling, because quality isn't decreased.
 Only MPlayer will play these files correctly, other players will display
 them with wrong aspect.
 The aspect parameter can be given as a ratio or a floating point number.
-Example:
-.RSss
-aspect=16/9, aspect=1.78
-.REss
-.IPs autoaspect
+
+.RS
+.I EXAMPLE:
+.RE
+.RSs
+.PD 0
+.IPs "aspect=16/9 or aspect=1.78"
+.PD 1
+.RE
+.TP
+.B autoaspect
 Same as the aspect option, but automatically computes aspect, taking
 into account all the adjustments (crop/expand/scale/etc.) made in the
 filter chain.
-.IPs vbitrate=<value>
-specify bitrate (pass\ 1/\:2) in
-.RSss
-kBit <4\-16000> or
-.br
-Bit  <16001\-24000000>
-.br
-(warning: 1kBit = 1000 Bits)
-.br
-(default: 800)
-.REss
-.IPs vratetol=<value>
+.TP
+.B vbitrate=<value>
+specify bitrate (pass\ 1/\:2).  Warning: 1kBit = 1000 Bits.
+.RSs
+.IPs 4\-16000
+(in kbit)
+.IPs 16001\-24000000
+(in bit)
+.IPs 800
+default
+.RE
+.TP
+.B vratetol=<value>
 approximated filesize tolerance in kBit. 1000\-100000 is a sane range.
 (warning: 1kBit = 1000 Bits)
 (default: 8000)
-.IPs vrc_maxrate=<value>
+.TP
+.B vrc_maxrate=<value>
 maximum bitrate in kbit/\:sec (pass\ 1/\:2)
-.IPs vrc_minrate=<value>
+.TP
+.B vrc_minrate=<value>
 minimum bitrate in kbit/\:sec (pass\ 1/\:2)
-.IPs vrc_buf_size=<value>
+.TP
+.B vrc_buf_size=<value>
 buffer size in kbit (pass\ 1/\:2).
 Note: vratetol should not be too large during the second pass or there might
 be problems if vrc_(min|max)rate is used.
-.IPs vb_qfactor=<-31.0\-31.0>
+.TP