diff options
| author | wm4 <wm4@nowhere> | 2015-09-30 22:52:22 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-09-30 22:52:22 +0200 |
| commit | ebb43f5176d52158dc6b115ce60305a2c8a63b76 (patch) | |
| tree | f1f547f4d9565b2c7857d56b996fe60a0cddaa04 /DOCS | |
| parent | aff6e8e8da4aedda42bff9260ed46cf01985bdc0 (diff) | |
| download | mpv-ebb43f5176d52158dc6b115ce60305a2c8a63b76.tar.bz2 mpv-ebb43f5176d52158dc6b115ce60305a2c8a63b76.tar.xz | |
Revert "vo_x11: remove this video output"
This reverts commit d11184a256ed709a03fa94a4e3940eed1b76d76f.
Unfortunately, there was a lot of unexpected resistance.
Do note that this is still extremely slow, crappy, etc.
Note that vo_x11.c was further edited. Compared to the removed vo_x11.c,
an additional ~200 lines of code was removed in order to simplify it. I
tried to strip it down as much as possible. In particular, support for
odd non-32 bit formats (24, 16, 15, 8 bit) is dropped.
Closes #2300.
Diffstat (limited to 'DOCS')
| -rw-r--r-- | DOCS/man/vo.rst | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst index 52aedfa494..44a5aedc03 100644 --- a/DOCS/man/vo.rst +++ b/DOCS/man/vo.rst @@ -75,6 +75,12 @@ Available video output drivers are: not responding quickly enough if video FPS is close to or higher than the display refresh rate. +``x11`` (X11 only) + Shared memory video output driver without hardware acceleration that works + whenever X11 is present. + + .. note:: This is a fallback only, and should not be normally used. + ``vdpau`` (X11 only) Uses the VDPAU interface to display and optionally also decode video. Hardware decoding is used with ``--hwdec=vdpau``. |