summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorAaron Boxer <boxerab@protonmail.com>2022-09-29 09:50:51 -0400
committerDudemanguy <random342@airmail.cc>2022-10-26 18:41:47 +0000
commitaeb4792cb6804a78974faa329a9c9f8a7bb5fa7b (patch)
treee8c53710607618bfd20b3a1dfa35cc192eb85d38 /DOCS
parent7358b9d37126e824cbc3a226d832e9cc1d7b01ea (diff)
downloadmpv-aeb4792cb6804a78974faa329a9c9f8a7bb5fa7b.tar.bz2
mpv-aeb4792cb6804a78974faa329a9c9f8a7bb5fa7b.tar.xz
vo_vaapi_wayland: remove, as it is superceded by vo_dmabuf_wayland
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/interface-changes.rst2
-rw-r--r--DOCS/man/options.rst2
-rw-r--r--DOCS/man/vo.rst13
3 files changed, 9 insertions, 8 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst
index 08641b046a..4a21d3ba5c 100644
--- a/DOCS/interface-changes.rst
+++ b/DOCS/interface-changes.rst
@@ -41,7 +41,7 @@ Interface changes
- add `dolbyvision` sub-parameter to `format` video filter
- `--sub-visibility` no longer has any effect on secondary subtitles
- add `film-grain` sub-parameter to `format` video filter
- - add experimental `--vo=vaapi-wayland` video output driver
+ - add experimental `--vo=dmabuf-wayland` video output driver
- add `--x11-present` for controlling whether to use xorg's present extension
- add `engine` option to the `rubberband` audio filter to support the new
engine introduced in rubberband 3.0.0. Defaults to `finer` (new engine).
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 11e5cd732d..ed55dbfeae 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -1249,7 +1249,7 @@ Video
:videotoolbox: requires ``--vo=gpu`` (macOS 10.8 and up),
or ``--vo=libmpv`` (iOS 9.0 and up)
:videotoolbox-copy: copies video back into system RAM (macOS 10.8 or iOS 9.0 and up)
- :vaapi: requires ``--vo=gpu``, ``--vo=vaapi`` or ``--vo=vaapi-wayland`` (Linux only)
+ :vaapi: requires ``--vo=gpu``, ``--vo=vaapi`` or ``--vo=dmabuf-wayland`` (Linux only)
:vaapi-copy: copies video back into system RAM (Linux with some GPUs only)
:nvdec: requires ``--vo=gpu`` (Any platform CUDA is available)
:nvdec-copy: copies video back to system RAM (Any platform CUDA is available)
diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst
index c71ebd4c45..06e80c4ea2 100644
--- a/DOCS/man/vo.rst
+++ b/DOCS/man/vo.rst
@@ -286,12 +286,13 @@ Available video output drivers are:
``--sdl-switch-mode``
Instruct SDL to switch the monitor video mode when going fullscreen.
-``vaapi-wayland``
- Experimental Wayland output driver designed for use with VA API hardware decoding.
- The driver is designed to avoid any GPU to CPU copies, and to perform scaling and
- color space conversion using fixed-function hardware, if available,
- rather than GPU shaders. This frees up GPU resources for other tasks.
- Currently this driver is experimental and only works with the ``--hwdec=vaapi`` driver;
+``dmabuf-wayland``
+ Experimental Wayland output driver designed for use with either drm stateless
+ or VA API hardware decoding. The driver is designed to avoid any GPU to CPU copies,
+ and to perform scaling and color space conversion using fixed-function hardware,
+ if available, rather than GPU shaders. This frees up GPU resources for other tasks.
+ Currently this driver is experimental and only works with the ``--hwdec=vaapi``
+ or ``hwdec=drm`` drivers;
OSD is also not supported. Supported compositors : Weston and Sway.
``vaapi``