diff options
| author | Jan Schmidt <thaytan@mad.scientist.com> | 2006-02-22 14:37:20 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2006-02-22 14:37:20 +0000 |
| commit | f27209c6d75ee279078ad7f7bbca4b0fc56dcb27 (patch) | |
| tree | 6aae5f80075edf2ec81988af4e2ae486f3f0a20d /sys | |
| parent | 091e9393442ac1fa9e4d200321b6740ea6dd6331 (diff) | |
| download | gst-plugins-bad-f27209c6d75ee279078ad7f7bbca4b0fc56dcb27.tar.gz gst-plugins-bad-f27209c6d75ee279078ad7f7bbca4b0fc56dcb27.tar.bz2 gst-plugins-bad-f27209c6d75ee279078ad7f7bbca4b0fc56dcb27.zip | |
Cygwin Ports maintainer.
Original commit message from CVS:
* configure.ac:
* sys/glsink/Makefile.am:
Merge patch from #317048 for building on Cygwin. Patch by
Cygwin Ports maintainer.
* sys/glsink/glimagesink.c: (gst_glimage_sink_init_display):
Move normal debug output to LOG level not ERROR.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/glsink/Makefile.am | 2 | ||||
| -rw-r--r-- | sys/glsink/glimagesink.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/glsink/Makefile.am b/sys/glsink/Makefile.am index 408a64dd..93a1bb56 100644 --- a/sys/glsink/Makefile.am +++ b/sys/glsink/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/sys/glsink/glimagesink.c b/sys/glsink/glimagesink.c index 1ec68c4b..b5a7a129 100644 --- a/sys/glsink/glimagesink.c +++ b/sys/glsink/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; } |