summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2023-02-13 00:41:51 +0000
committerMatthias Clasen <mclasen@redhat.com>2023-02-13 00:41:51 +0000
commita770b429ec05375931cb8e02d9395e4187e98c44 (patch)
tree4a20f6af6cb490eed6933083a26731f7c6c5f6ca
parentf121f607aecdc7513e378985a76d55ad258f2b8a (diff)
parent7430bd7780ed6b33d9bbc4d78ec241b84c5c65c7 (diff)
downloadgtk+-a770b429ec05375931cb8e02d9395e4187e98c44.tar.gz
Merge branch 'fix-gst-gl-use' into 'main'
gstreamer: Fix gl context use Closes #5586 See merge request GNOME/gtk!5508
-rw-r--r--modules/media/gtkgstsink.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/media/gtkgstsink.c b/modules/media/gtkgstsink.c
index 182283de64..0e3e29b9f7 100644
--- a/modules/media/gtkgstsink.c
+++ b/modules/media/gtkgstsink.c
@@ -292,7 +292,9 @@ gtk_gst_sink_texture_from_buffer (GtkGstSink *self,
sync_meta = gst_buffer_get_gl_sync_meta (buffer);
if (sync_meta) {
gst_gl_sync_meta_set_sync_point (sync_meta, self->gst_context);
+ gst_gl_context_activate (self->gst_gdk_context, TRUE);
gst_gl_sync_meta_wait (sync_meta, self->gst_gdk_context);
+ gst_gl_context_activate (self->gst_gdk_context, FALSE);
}
texture = gdk_gl_texture_new (self->gdk_context,