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 | |
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')
-rw-r--r-- | DOCS/man/en/mplayer.1 | 5 | ||||
-rw-r--r-- | DOCS/xml/en/bugreports.xml | 2 | ||||
-rw-r--r-- | DOCS/xml/ru/bugreports.xml | 4 |
3 files changed, 10 insertions, 1 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. diff --git a/DOCS/xml/en/bugreports.xml b/DOCS/xml/en/bugreports.xml index d541230f4f..de716463b2 100644 --- a/DOCS/xml/en/bugreports.xml +++ b/DOCS/xml/en/bugreports.xml @@ -113,6 +113,8 @@ you need to go back. earlier version, so if you do not make a backup copy of your original source tree, you will have to recompile everything in it when you come back to the present.) +Alternatively you may use <ulink url="http://ccache.samba.org/">ccache</ulink> +to speed up compilation. </para> <para> diff --git a/DOCS/xml/ru/bugreports.xml b/DOCS/xml/ru/bugreports.xml index 1b28ff3592..8a33797b4a 100644 --- a/DOCS/xml/ru/bugreports.xml +++ b/DOCS/xml/ru/bugreports.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- synced with r28201 --> +<!-- synced with r28615 --> <appendix id="bugreports"> <title>Как сообщать об ошибках</title> @@ -109,6 +109,8 @@ make (Как правило необходимо выполнять 'make distclean' до перекомпиляции более ранней версии, поэтому при отсутствии сохраненной копии Вам придется перекомпилировать весь проект.) +Также Вы можете использовать <ulink url="http://ccache.samba.org/">ccache</ulink> +для ускорения компиляции. </para> <para> |