summaryrefslogtreecommitdiffstats
path: root/DOCS/man/en
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-11-16 06:54:22 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-11-16 07:01:46 +0200
commit287b62163eed8811b6cd33716c0691d328947d48 (patch)
tree3143d2cb17b32a19e3e7e0aa428210d1bba3eb0b /DOCS/man/en
parent507f4fe6c7811558b1367e4b64855ae7f9bc8da8 (diff)
parentb411278fbb00767b8013604157a43e0203f66f4c (diff)
downloadmpv-287b62163eed8811b6cd33716c0691d328947d48.tar.bz2
mpv-287b62163eed8811b6cd33716c0691d328947d48.tar.xz
Merge svn changes up to r29912
Diffstat (limited to 'DOCS/man/en')
-rw-r--r--DOCS/man/en/mplayer.1108
1 files changed, 63 insertions, 45 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 50757d6bbe..1a851be78b 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -401,7 +401,8 @@ Confirm choice.
.RS
.
(The following keys are only valid if teletext support is enabled during
-compilation: They are used for controlling TV teletext.)
+compilation: They are used for controlling TV teletext, whose data may come
+from either an analog TV source or an MPEG Transport Stream.)
.RE
.PP
.PD 0
@@ -500,11 +501,12 @@ named 'movie.avi.conf' with the file-specific options in it and put it in
You can also put the configuration file in the same directory as the file to
be played, as long as you give the \-use\-filedir\-conf option (either on the
command line or in your global config file).
-If a file-specific configuration file is found in the same directory, no file-specific
-configuration is loaded from ~/.mplayer.
-In addition, the \-use\-filedir\-conf option enables directory-specific configuration files.
-For this, MPlayer first tries to load a mplayer.conf from the same directory as the file played
-and then tries to load any file-specific configuration.
+If a file-specific configuration file is found in the same directory, no
+file-specific configuration is loaded from ~/.mplayer.
+In addition, the \-use\-filedir\-conf option enables directory-specific
+configuration files.
+For this, MPlayer first tries to load a mplayer.conf from the same directory as
+the file played and then tries to load any file-specific configuration.
.PP
.I EXAMPLE MPLAYER CONFIGURATION FILE:
.sp 1
@@ -1006,7 +1008,7 @@ Display the main menu at MPlayer startup.
Permit MPlayer to receive pointer events reported by the video
output driver.
Necessary to select the buttons in DVD menus.
-Supported for X11 based VOs (x11, xv, xvmc, etc.) and the gl, gl2, direct3d and
+Supported for X11-based VOs (x11, xv, xvmc, etc) and the gl, gl2, direct3d and
corevideo VOs.
.
.TP
@@ -1273,6 +1275,8 @@ stereo
surround
.IPs 6
full 5.1
+.IPs 8
+full 7.1
.RE
.PD 1
.
@@ -1768,7 +1772,7 @@ Not guaranteed to work correctly with \-oac copy.
.
.TP
.B \-srate <Hz>
-Selects the output sample rate to be used
+Select the output sample rate to be used
(of course sound cards have limits on this).
If the sample frequency selected is different from that
of the current media, the resample or lavcresample audio filter will be inserted
@@ -2294,7 +2298,8 @@ If you cannot select one of the subtitles on a DVD, also try \-vobsubid.
.
.TP
.B \-nosub
-Disables any otherwise auto-selected subtitles (as e.g. the Matroska/mkv demuxer supports).
+Disables any otherwise auto-selected subtitles (as e.g.\& the Matroska/mkv
+demuxer supports).
.
.TP
.B \-slang <language code[,language code,...]> (also see \-sid)
@@ -2736,8 +2741,8 @@ Useful if you want to have certain connections established automatically.
.IPs (no)estimate
Estimate the audio delay, supposed to make the video playback smoother
(default: enabled).
-.IPs (no)autostart (default: disabled)
-Automatically start jackd if necessary.
+.IPs (no)autostart
+Automatically start jackd if necessary (default: disabled).
Note that this seems unreliable and will spam stdout with server messages.
.RE
.PD 1
@@ -3058,7 +3063,7 @@ Use the _WIN_LAYER hint with the given layer number.
.IPs netwm
Force NETWM style.
.IPs "none\ "
-Do not set fullscreen window layer.
+Clear the list of modes; you can add modes to enable afterward.
.IPs stays_on_top
Use _NETWM_STATE_STAYS_ON_TOP hint if available.
.REss
@@ -3149,6 +3154,10 @@ A value of 1 means square pixels
(correct for (almost?) all LCDs).
.
.TP
+.B \-name (X11 only)
+Set the window class name.
+.
+.TP
.B \-nodouble
Disables double buffering, mostly for debugging purposes.
Double buffering fixes flicker by storing two frames in memory, and
@@ -3228,6 +3237,16 @@ If your screensaver supports neither the XSS nor XResetScreenSaver
API please use \-heartbeat\-cmd instead.
.
.TP
+.B \-title (also see \-use\-filename\-title)
+Set the window title.
+Supported by X11-based video output drivers.
+.
+.TP
+.B \-use\-filename\-title (also see \-title)
+Set the window title using the media filename, when not set with \-title.
+Supported by X11-based video output drivers.
+.
+.TP
.B "\-vm \ \ \ "
Try to change to a different video mode.
Supported by the dga, x11, xv, sdl and directx video output drivers.
@@ -3244,7 +3263,7 @@ Enables VBI for the vesa, dfbmga and svga video output drivers.
This tells MPlayer to attach to an existing window.
Useful to embed MPlayer in a browser (e.g.\& the plugger extension).
This option fills the given window completely, thus aspect scaling,
-panscan etc. are no longer handled by MPlayer but must be managed by the
+panscan, etc are no longer handled by MPlayer but must be managed by the
application that created the window.
.
.TP
@@ -3410,8 +3429,8 @@ Select the driver to use as source to overlay on top of X11.
.PD 1
.
.TP
-.B vdpau (with \-vc ffmpeg12vdpau, ffwmv3vdpau, ffvc1vdpau or ffh264vdpau or
-ffodivxvdpau)
+.B vdpau (with \-vc ffmpeg12vdpau, ffwmv3vdpau, ffvc1vdpau, ffh264vdpau
+or ffodivxvdpau)
Video output that uses VDPAU to decode video via hardware.
Also supports displaying of software-decoded video.
.PD 0
@@ -3422,21 +3441,21 @@ for negative values a blurring algorithm (default: 0).
.IPs denoise=<0\-1>
Apply a noise reduction algorithm to the video (default: 0, no noise reduction).
.IPs deint=<0\-4>
-Chooses the deinterlacer (default: 0).
+Select the deinterlacer (default: 0).
All modes > 0 respect \-field\-dominance.
.RSss
.IPs 0
-No deinterlacing.
+no deinterlacing
.IPs 1
Show only first field, similar to \-vf field.
.IPs 2
Bob deinterlacing, similar to \-vf tfields=1.
.IPs 3
-Motion adaptive temporal deinterlacing.
+motion adaptive temporal deinterlacing
May lead to A/V desync with slow video hardware and/or high resolution.
This is the default if "D" is used to enable deinterlacing.
.IPs 4
-Motion adaptive temporal deinterlacing with edge-guided spatial interpolation.
+motion adaptive temporal deinterlacing with edge-guided spatial interpolation
Needs fast video hardware.
.RE
.IPs chroma\-deint
@@ -3446,7 +3465,7 @@ Useful with slow video memory.
.IPs pullup
Try to apply inverse telecine, needs motion adaptive temporal deinterlacing.
.IPs colorspace
-Select the color space for YUV to RGB conversion (default: 1, BT.601).
+Select the color space for YUV to RGB conversion.
In general BT.601 should be used for standard definition (SD) content and
BT.709 for high definition (HD) content.
Using incorrect color space results in slightly under or over saturated and
@@ -3463,7 +3482,7 @@ Use ITU-R BT.709 color space.
.IPs 3
Use SMPTE-240M color space.
.RE
-IPs hqscaling
+.IPs hqscaling
.RSss
.IPs 0
Use default VDPAU scaling (default).
@@ -3523,7 +3542,7 @@ Since SDL uses its own X11 layer, MPlayer X11 options do not have
any effect on SDL.
Note that it has several minor bugs (\-vm/\-novm is mostly ignored,
\-fs behaves like \-novm should, window is in top-left corner when
-returning from fullscreen, panscan is not supported, ...)
+returning from fullscreen, panscan is not supported, ...).
.PD 0
.RSs
.IPs driver=<driver>
@@ -3608,7 +3627,7 @@ Force WarpOverlay! mode.
.IPs dive
Force DIVE mode.
.IPs (no)t23
-Enable/disable workaround for T23 laptop (default: disabled).
+Enable or disable workaround for T23 laptop (default: disabled).
Try to enable this option if your video card supports upscaling only.
.RE
.PD 1
@@ -4947,7 +4966,7 @@ Allow (1) or disallow (0) the output frequency to differ slightly
from the frequency given by <srate> (default: 1).
Can be used if the startup of the playback is extremely slow.
.IPs <type>
-Selects which resampling method to use.
+Select which resampling method to use.
.RSss
0: linear interpolation (fast, poor quality especially when upsampling)
.br
@@ -5052,7 +5071,7 @@ Reasonable values are around 0.001.
.PD 1
.
.TP
-.B bs2b[=option1:option2]
+.B bs2b[=option1:option2:...]
Bauer stereophonic to binaural transformation using libbs2b.
Improves the headphone listening experience by making the sound
similar to that from loudspeakers, allowing each ear to hear both
@@ -5067,15 +5086,15 @@ Set cut frequency in Hz.
Set feed level for low frequencies in 0.1*dB.
.IPs profile=<value>
Several profiles are available for convenience:
+.PD 0
.RSs
-default: will be used if nothing else was specified (fcut=700,
-feed=45);
-.br
-cmoy: Chu Moy circuit implementation (fcut=700, feed=60);
-.br
-jmeier: Jan Meier circuit implementation (fcut=650, feed=95).
-.REss
-.PD 1
+.IPs default
+will be used if nothing else was specified (fcut=700, feed=45)
+.IPs "cmoy\ "
+Chu Moy circuit implementation (fcut=700, feed=60)
+.IPs jmeier
+Jan Meier circuit implementation (fcut=650, feed=95)
+.RE
.RE
.sp 1
.RS
@@ -5159,11 +5178,11 @@ of input channels the exceeding channels are truncated.
.PD 0
.RSs
.IPs <nch>
-number of output channels (1\-6)
+number of output channels (1\-8)
.IPs "<nr>\ "
-number of routes (1\-6)
+number of routes (1\-8)
.IPs <from1:to1:from2:to2:from3:to3:...>
-Pairs of numbers between 0 and 5 that define where to route each channel.
+Pairs of numbers between 0 and 7 that define where to route each channel.
.RE
.sp 1
.RS
@@ -5266,7 +5285,7 @@ this filter can be found in the examples section near the end.
.PD 0
.RSs
.IPs "<n>\ \ "
-number of output channels (1\-6)
+number of output channels (1\-8)
.IPs <Lij>
How much of input channel i is mixed into output channel j (0\-1).
So in principle you first have n numbers saying what to do with the
@@ -5309,7 +5328,7 @@ For the best result try setting the cutoff frequency as low as possible.
This will improve the stereo or surround sound experience.
.IPs "<ch>\ "
Determines the channel number in which to insert the sub-channel audio.
-Channel number can be between 0 and 5 (default: 5).
+Channel number can be between 0 and 7 (default: 5).
Observe that the number of channels will automatically
be increased to <ch> if necessary.
.RE
@@ -5334,7 +5353,7 @@ halves the channels instead.
.RSs
.IPs "<ch>\ "
Determines the channel number in which to insert the center channel.
-Channel number can be between 0 and 5 (default: 5).
+Channel number can be between 0 and 7 (default: 5).
Observe that the number of channels will automatically
be increased to <ch> if necessary.
.RE
@@ -5760,7 +5779,7 @@ Rotate by 90 degrees counterclockwise and flip.
.RE
.
.TP
-.B scale[=w:h[:ilaced[:chr_drop[:par[:par2[:presize[:noup[:arnd]]]]]]]]
+.B scale[=w:h[:interlaced[:chr_drop[:par[:par2[:presize[:noup[:arnd]]]]]]]]
Scales the image with the software scaler (slow) and performs a YUV<\->RGB
colorspace conversion (also see \-sws).
.RSs
@@ -5781,7 +5800,7 @@ incapable of scaling, it defaults to d_width/\:d_height!
.br
\-(n+8): Like \-n above, but rounding the dimension to the closest multiple of 16.
.REss
-.IPs <ilaced>
+.IPs <interlaced>
Toggle interlaced scaling.
.RSss
0: off (default)
@@ -7300,9 +7319,9 @@ Files named 'shotNNNN.png' will be saved in the working directory,
using the first available number \- no files will be overwritten.
The filter has no overhead when not used and accepts an arbitrary
colorspace, so it is safe to add it to the configuration file.
-Make sure that screenshot is added after all other filters that
-you want to have applied to it.
-E.g. it should be the last filter if you want to have an exact
+Make sure that the screenshot filter is added after all other filters
+whose effect you want to record on the saved image.
+E.g.\& it should be the last filter if you want to have an exact
screenshot of what you see on the monitor.
.RE
.
@@ -10314,7 +10333,6 @@ trellis (requires trellis, experimental) (default: 0.0)
.RE
.PD 1
.
-.
.TP
.B deadzone_inter=<0\-32>
Set the size of the inter luma quantization deadzone for non-trellis