summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2011-01-04 23:51:31 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2011-01-04 23:51:31 +0200
commit30445e2fa4cc9f1d018ae06a81c50d51a72a4908 (patch)
tree7b2080e336deceed2e7eb882268130697503f520 /DOCS
parent30c5994382301ad72b7fbf60687ac666d7447612 (diff)
downloadmpv-30445e2fa4cc9f1d018ae06a81c50d51a72a4908.tar.bz2
mpv-30445e2fa4cc9f1d018ae06a81c50d51a72a4908.tar.xz
vo_vdpau: allow "deint=-N" to specify mode without enabling deint
Allow negative values of the "deint" parameter and make them select the same deinterlacing mode as the corresponding positive value, but without enabling deinterlace on startup. This is useful for configuration files. Also tweak the overall manpage description of vo_vdpau a bit to make it sound less as if the VO would be for hardware acceleration only.
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/en/mplayer.123
1 files changed, 13 insertions, 10 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index cf429bcc14..f44367375b 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -3499,9 +3499,9 @@ Select the driver to use as source to overlay on top of X11.
.PD 1
.
.TP
-.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.
+.B vdpau (X11 only)
+Uses the VDPAU interface to display and optionally also decode video.
+Hardware decoding is used with \-vc ffmpeg12vdpau, ffwmv3vdpau, ffvc1vdpau, ffh264vdpau or ffodivxvdpau.
.PD 0
.RSs
.IPs sharpen=<\-1\-1>
@@ -3509,22 +3509,25 @@ For positive values, apply a sharpening algorithm to the video,
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>
-Select the deinterlacer (default: 0).
-All modes > 0 respect \-field\-dominance.
+.IPs deint=<-4\-4>
+Select deinterlacing mode (default: -3).
+Positive values choose mode and enable deinterlacing.
+Corresponding negative values select the same deinterlacing mode,
+but do not enable deinterlacing on startup (useful in configuration files
+to specify what mode will be enabled by the "D" key).
+All modes respect \-field\-dominance.
.RSss
.IPs 0
-no deinterlacing
+same as -3
.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