summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sys/glsink/glimagesink.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 431ca83b..4fc297b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-14 David Schleef <ds@schleef.org>
+
+ * sys/glsink/glimagesink.c: And remember to set the context
+ on the current thread, since there may be other glimagesinks.
+
2005-05-13 David Schleef <ds@schleef.org>
* sys/glsink/glimagesink.c:
diff --git a/sys/glsink/glimagesink.c b/sys/glsink/glimagesink.c
index 9eb03177..ce2303b6 100644
--- a/sys/glsink/glimagesink.c
+++ b/sys/glsink/glimagesink.c
@@ -452,6 +452,9 @@ gst_glimagesink_chain (GstPad * pad, GstData * data)
glimagesink->time = GST_BUFFER_TIMESTAMP (buf);
}
+ glXMakeCurrent (glimagesink->display, glimagesink->window,
+ glimagesink->context);
+
if (glimagesink->parent_window) {
XGetWindowAttributes (glimagesink->display, glimagesink->parent_window,
&attr);