mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-12 18:35:35 +00:00
Code Issues 1 Projects Releases Wiki Activity

gtk: add to the generic/states test

Browse source
This commit is contained in:
Matthew Waters 2015-07-09 13:03:23 +10:00
parent d95fd04960
commit abde710f42
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/gtk/gtkgstglwidget.c
View file

@ -586,7 +586,7 @@ gtk_gst_gl_widget_set_buffer (GtkGstGLWidget * widget, GstBuffer * buffer)
GMainContext *main_context = g_main_context_default (); GMainContext *main_context = g_main_context_default ();
g_return_if_fail (GTK_IS_GST_GL_WIDGET (widget)); g_return_if_fail (GTK_IS_GST_GL_WIDGET (widget));
g_return_if_fail (widget->priv->negotiated); g_return_if_fail (buffer == NULL || widget->priv->negotiated);
g_mutex_lock (&widget->priv->lock); g_mutex_lock (&widget->priv->lock);

2
ext/gtk/gtkgstwidget.c
View file

@ -341,7 +341,7 @@ gtk_gst_widget_set_buffer (GtkGstWidget * widget, GstBuffer * buffer)
GMainContext *main_context = g_main_context_default (); GMainContext *main_context = g_main_context_default ();
g_return_if_fail (GTK_IS_GST_WIDGET (widget)); g_return_if_fail (GTK_IS_GST_WIDGET (widget));
g_return_if_fail (widget->priv->negotiated); g_return_if_fail (buffer == NULL || widget->priv->negotiated);
g_mutex_lock (&widget->priv->lock); g_mutex_lock (&widget->priv->lock);

3
tests/check/Makefile.am
View file

@ -19,8 +19,7 @@ AM_TESTS_ENVIRONMENT = \
decklinksink dtlssrtpdec dtlssrtpenc dvbsrc dvbbasebin dfbvideosink festival fluidsynth gsettingsvideosrc \ decklinksink dtlssrtpdec dtlssrtpenc dvbsrc dvbbasebin dfbvideosink festival fluidsynth gsettingsvideosrc \
gsettingsvideosink gsettingsaudiosrc gsettingsaudiosink linsyssdisrc linsyssdisink nassink \ gsettingsvideosink gsettingsaudiosrc gsettingsaudiosink linsyssdisrc linsyssdisink nassink \
rsndvdbin sdlaudiosink sdlvideosink vcdsrc rfbsrc vdpauyuvvideo vdpauvideoyuv \ rsndvdbin sdlaudiosink sdlvideosink vcdsrc rfbsrc vdpauyuvvideo vdpauvideoyuv \
vdpaumpegdec vdpaumpeg4dec vdpauh264dec vdpauvideopostprocess vdpausink neonhttpsrc \ vdpaumpegdec vdpaumpeg4dec vdpauh264dec vdpauvideopostprocess vdpausink neonhttpsrc"
gtksink gtkglsink"
plugindir = $(libdir)/gstreamer-@GST_API_VERSION@ plugindir = $(libdir)/gstreamer-@GST_API_VERSION@