diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-18 01:07:37 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-18 01:45:36 +0200 |
| commit | 186e5a998c8424b3c850b62d6f5755a0928cd64c (patch) | |
| tree | cabc9881fb5ed2c6dbe5f771323a55c50136a091 /DOCS/man | |
| parent | 41ac08d2b45f0f6eb369ea57604796be69200185 (diff) | |
| parent | e5ee1232c5e00e730d69cf57767b1ee3ab5b4e16 (diff) | |
| download | mpv-186e5a998c8424b3c850b62d6f5755a0928cd64c.tar.bz2 mpv-186e5a998c8424b3c850b62d6f5755a0928cd64c.tar.xz | |
Merge svn changes up to r28641
Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border
macro) to use a wrapper macro in old-style VOs which do not provide a
VO object argument. Before this function had an explicit global_vo
argument in vo_gl/gl2. New vo_vdpau uses it too so use the same
mechanism as most other functions.
Diffstat (limited to 'DOCS/man')
| -rw-r--r-- | DOCS/man/en/mplayer.1 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index d0920e4a45..af89e6e64f 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -3423,6 +3423,11 @@ 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) +Video output that uses VDPAU to decode video via hardware. +Also supports displaying of software-decoded video. +. +.TP .B xvmc (X11 with \-vc ffmpeg12mc only) Video output driver that uses the XvMC (X Video Motion Compensation) extension of XFree86 4.x to speed up MPEG-1/2 and VCR2 decoding. |