mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

gtk/gl: don't assert when gdk doesn't provide a GL context

Browse source 
Allows the application to check whether gtkglsink is supported by setting
the element to READY.

https://bugzilla.gnome.org/show_bug.cgi?id=764148
This commit is contained in:
Matthew Waters 2016-03-25 17:49:14 +11:00
parent dbd12ec82b
commit cfbe7d1399
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ext/gtk/gtkgstglwidget.c
View file

@ -420,8 +420,13 @@ _get_gl_context (GtkGstGLWidget * gst_widget)
gtk_widget_realize (GTK_WIDGET (gst_widget)); gtk_widget_realize (GTK_WIDGET (gst_widget));
if (priv->other_context)
gst_object_unref (priv->other_context);
priv->other_context = NULL;
if (priv->gdk_context) if (priv->gdk_context)
g_object_unref (priv->gdk_context); g_object_unref (priv->gdk_context);
priv->gdk_context = gtk_gl_area_get_context (GTK_GL_AREA (gst_widget)); priv->gdk_context = gtk_gl_area_get_context (GTK_GL_AREA (gst_widget));
if (priv->gdk_context == NULL) { if (priv->gdk_context == NULL) {
GError *error = gtk_gl_area_get_error (GTK_GL_AREA (gst_widget)); GError *error = gtk_gl_area_get_error (GTK_GL_AREA (gst_widget));
@ -429,7 +434,6 @@ _get_gl_context (GtkGstGLWidget * gst_widget)
GST_ERROR_OBJECT (gst_widget, "Error creating GdkGLContext : %s", GST_ERROR_OBJECT (gst_widget, "Error creating GdkGLContext : %s",
error ? error->message : "No error set by Gdk"); error ? error->message : "No error set by Gdk");
g_clear_error (&error); g_clear_error (&error);
g_assert_not_reached ();
return; return;
} }