mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

[022/906] * 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.

Browse source
This commit is contained in:
Jan Schmidt 2006-02-22 14:37:20 +00:00 committed by Matthew Waters
parent 30ce65ad7f
commit f9cd135d90
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst/gl/Makefile.am
View file

@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstglimagesink.la
libgstglimagesink_la_SOURCES = glimagesink.c libgstglimagesink_la_SOURCES = glimagesink.c
libgstglimagesink_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \ libgstglimagesink_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \
$(GST_PLUGINS_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_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
$(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR)
libgstglimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstglimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

8
gst/gl/glimagesink.c
View file

@ -568,11 +568,11 @@ gst_glimage_sink_init_display (GstGLImageSink * glimage_sink)
const char *extstring; const char *extstring;
Window window; Window window;
GST_ERROR ("initializing display"); GST_LOG_OBJECT (glimage_sink, "initializing display");
glimage_sink->display = XOpenDisplay (NULL); glimage_sink->display = XOpenDisplay (NULL);
if (glimage_sink->display == NULL) { if (glimage_sink->display == NULL) {
GST_ERROR ("Could not open display"); GST_ERROR_OBJECT (glimage_sink, "Could not open display");
return FALSE; return FALSE;
} }
@ -582,13 +582,13 @@ gst_glimage_sink_init_display (GstGLImageSink * glimage_sink)
ret = glXQueryExtension (glimage_sink->display, &error_base, &event_base); ret = glXQueryExtension (glimage_sink->display, &error_base, &event_base);
if (!ret) { if (!ret) {
GST_ERROR ("No GLX extension"); GST_LOG_OBJECT (glimage_sink, "No GLX extension");
return FALSE; return FALSE;
} }
visinfo = glXChooseVisual (glimage_sink->display, scrnum, attrib); visinfo = glXChooseVisual (glimage_sink->display, scrnum, attrib);
if (visinfo == NULL) { if (visinfo == NULL) {
GST_ERROR ("No usable visual"); GST_LOG_OBJECT (glimage_sink, "No usable visual");
return FALSE; return FALSE;
} }