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

glmixer: Only finalize the other context in finalize()

Browse source 
Otherwise we change a value of a property when going to READY state,
which is unexpected behaviour.
This commit is contained in:
Sebastian Dröge 2014-10-13 13:27:11 +02:00 committed by Tim-Philipp Müller
parent c46c642fd3
commit aed7da3d12
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ext/gl/gstglmixer.c
View file

@ -463,7 +463,13 @@ gst_gl_mixer_init (GstGLMixer * mix)
static void static void
gst_gl_mixer_finalize (GObject * object) gst_gl_mixer_finalize (GObject * object)
{ {
GstGLMixerPrivate *priv = GST_GL_MIXER (object)->priv; GstGLMixer *mix = GST_GL_MIXER (object);
GstGLMixerPrivate *priv = mix->priv;
if (mix->other_context) {
gst_object_unref (mix->other_context);
mix->other_context = NULL;
}
g_mutex_clear (&priv->gl_resource_lock); g_mutex_clear (&priv->gl_resource_lock);
g_cond_clear (&priv->gl_resource_cond); g_cond_clear (&priv->gl_resource_cond);
@ -1142,11 +1148,6 @@ gst_gl_mixer_stop (GstAggregator * agg)
mix->context = NULL; mix->context = NULL;
} }
if (mix->other_context) {
gst_object_unref (mix->other_context);
mix->other_context = NULL;
}
gst_gl_mixer_reset (mix); gst_gl_mixer_reset (mix);
return TRUE; return TRUE;