diff options
| author | Jan Ekström <jeebjp@gmail.com> | 2019-03-11 01:00:27 +0200 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2019-03-11 01:00:27 +0200 |
| commit | 199aabddcc0105b504cc8e0cb240bc3c89288c1a (patch) | |
| tree | fa7eb297a8e11b5e0d9339196f23918d6a4d0b85 /video/out/wayland_common.h | |
| parent | 7c565547b80fdc2a1bfdf31f9725129bcb16aa9d (diff) | |
| parent | 1d0349d3b5d9a263251fcb3b0d7e135d4731bfd0 (diff) | |
| download | mpv-199aabddcc0105b504cc8e0cb240bc3c89288c1a.tar.bz2 mpv-199aabddcc0105b504cc8e0cb240bc3c89288c1a.tar.xz | |
Merge branch 'master' into pr6360
Manual changes done:
* Merged the interface-changes under the already master'd changes.
* Moved the hwdec-related option changes to video/decode/vd_lavc.c.
Diffstat (limited to 'video/out/wayland_common.h')
| -rw-r--r-- | video/out/wayland_common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/wayland_common.h b/video/out/wayland_common.h index b381d7c46f..0648efa09a 100644 --- a/video/out/wayland_common.h +++ b/video/out/wayland_common.h @@ -70,7 +70,7 @@ struct vo_wayland_state { /* Shell */ struct wl_surface *surface; - struct xdg_wm_base *shell; + struct xdg_wm_base *wm_base; struct xdg_toplevel *xdg_toplevel; struct xdg_surface *xdg_surface; struct zxdg_decoration_manager_v1 *xdg_decoration_manager; |