summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2006-02-14 11:36:30 +0000
committerAndy Wingo <wingo@pobox.com>2006-02-14 11:36:30 +0000
commitb01a413122cab895cb99cf5ed011966129e57563 (patch)
tree69b31e673b47ba3024cad9b994e04117e78fb834
parentfb05a750e01e6167e19a86f34d60336b430068e6 (diff)
downloadgst-plugins-bad-b01a413122cab895cb99cf5ed011966129e57563.tar.gz
gst-plugins-bad-b01a413122cab895cb99cf5ed011966129e57563.tar.bz2
gst-plugins-bad-b01a413122cab895cb99cf5ed011966129e57563.zip
sys/glsink/glimagesink.c (gst_glimage_sink_init): Come on schleef, don't break me gst-inspect -a.
Original commit message from CVS: 2006-02-14 Andy Wingo <wingo@pobox.com> * sys/glsink/glimagesink.c (gst_glimage_sink_init): Come on schleef, don't break me gst-inspect -a.
-rw-r--r--ChangeLog5
-rw-r--r--sys/glsink/glimagesink.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e65cdd12..82f130b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-14 Andy Wingo <wingo@pobox.com>
+
+ * sys/glsink/glimagesink.c (gst_glimage_sink_init): Come on
+ schleef, don't break me gst-inspect -a.
+
2006-02-14 Edward Hervey <edward@fluendo.com>
* gst/qtdemux/qtdemux.c: (next_entry_size), (gst_qtdemux_chain):
diff --git a/sys/glsink/glimagesink.c b/sys/glsink/glimagesink.c
index 348fc330..1ec68c4b 100644
--- a/sys/glsink/glimagesink.c
+++ b/sys/glsink/glimagesink.c
@@ -180,12 +180,12 @@ gst_glimage_sink_init (GstGLImageSink * glimage_sink,
{
int screen;
- //glimage_sink->display = XOpenDisplay (NULL);
+ glimage_sink->display = XOpenDisplay (NULL);
screen = DefaultScreen (glimage_sink->display);
- //XSynchronize(glimage_sink->display, True);
- //XSetErrorHandler (error_handler);
+ XSynchronize (glimage_sink->display, True);
+ /* XSetErrorHandler (error_handler); */
glimage_sink->width = 400;
glimage_sink->height = 400;