summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moreau <oreaus@gmail.com>2021-06-11 09:27:46 -0600
committerTim-Philipp Müller <tim@centricular.com>2021-08-05 23:26:53 +0100
commit328e0854f71b8b2b95dfadb2bcbe695ae15abcea (patch)
treec960711c33a319663568ef3a6d8a413be9296f2c
parent93733ba1b2809e3ef9fb4514286e7cc562455556 (diff)
downloadgstreamer-plugins-base-328e0854f71b8b2b95dfadb2bcbe695ae15abcea.tar.gz
gl/wayland: Use consistent wl_display when creating work queue for proxy wrapper
Without this, glimagesink since wayland 727c7903 fails with gst-launch-1.0: ../src/wayland-client.c:2181: wl_proxy_set_queue: Assertion 'proxy->display == queue->display' failed. Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1247>
-rw-r--r--gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c b/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c
index bb8be2756..ecfa03b49 100644
--- a/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c
+++ b/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c
@@ -561,8 +561,7 @@ gst_gl_window_wayland_egl_open (GstGLWindow * window, GError ** error)
* each wayland resource we create as well as removing a race between
* creation and the `wl_proxy_set_queue()` call. */
window_egl->display.display = wl_proxy_create_wrapper (display->display);
- window_egl->window.queue =
- wl_display_create_queue (window_egl->display.display);
+ window_egl->window.queue = wl_display_create_queue (display->display);
wl_proxy_set_queue ((struct wl_proxy *) window_egl->display.display,
window_egl->window.queue);