[022/906] * configure.ac: * sys/glsink/Makefile.am: Merge patch...

diff --git a/gst/gl/Makefile.am b/gst/gl/Makefile.am
index 408a64d..93a1bb5 100644 (file)
--- a/gst/gl/Makefile.am
+++ b/gst/gl/Makefile.am
@@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstglimagesink.la
 libgstglimagesink_la_SOURCES =  glimagesink.c 
 libgstglimagesink_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \
        $(GST_PLUGINS_BASE_CFLAGS)
-libgstglimagesink_la_LIBADD = $(X_LIBS) $(XSHM_LIBS) -lGL -lGLU \
+libgstglimagesink_la_LIBADD = $(X_LIBS) $(XSHM_LIBS) -lGL \
        $(GST_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
        $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR)
 libgstglimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

diff --git a/gst/gl/glimagesink.c b/gst/gl/glimagesink.c
index 1ec68c4..b5a7a12 100644 (file)
--- a/gst/gl/glimagesink.c
+++ b/gst/gl/glimagesink.c
@@ -568,11 +568,11 @@ gst_glimage_sink_init_display (GstGLImageSink * glimage_sink)
   const char *extstring;
   Window window;
 
-  GST_ERROR ("initializing display");
+  GST_LOG_OBJECT (glimage_sink, "initializing display");
 
   glimage_sink->display = XOpenDisplay (NULL);
   if (glimage_sink->display == NULL) {
-    GST_ERROR ("Could not open display");
+    GST_ERROR_OBJECT (glimage_sink, "Could not open display");
     return FALSE;
   }
 
@@ -582,13 +582,13 @@ gst_glimage_sink_init_display (GstGLImageSink * glimage_sink)
 
   ret = glXQueryExtension (glimage_sink->display, &error_base, &event_base);
   if (!ret) {
-    GST_ERROR ("No GLX extension");
+    GST_LOG_OBJECT (glimage_sink, "No GLX extension");
     return FALSE;
   }
 
   visinfo = glXChooseVisual (glimage_sink->display, scrnum, attrib);
   if (visinfo == NULL) {
-    GST_ERROR ("No usable visual");
+    GST_LOG_OBJECT (glimage_sink, "No usable visual");
     return FALSE;
   }