mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 07:16:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

glmixer: update for aggregator start/stop vfunc change

Browse source
This commit is contained in:
Tim-Philipp Müller 2014-12-30 19:26:47 +00:00
parent c1f6ef5f53
commit de5604483f
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ext/gl/gstglmixer.c
View file

@ -1313,9 +1313,6 @@ gst_gl_mixer_start (GstAggregator * agg)
GstGLMixer *mix = GST_GL_MIXER (agg); GstGLMixer *mix = GST_GL_MIXER (agg);
GstElement *element = GST_ELEMENT (agg); GstElement *element = GST_ELEMENT (agg);
if (!GST_AGGREGATOR_CLASS (parent_class)->start (agg))
return FALSE;
GST_OBJECT_LOCK (mix); GST_OBJECT_LOCK (mix);
mix->array_buffers = g_ptr_array_new_full (element->numsinkpads, mix->array_buffers = g_ptr_array_new_full (element->numsinkpads,
(GDestroyNotify) _free_glmixer_frame_data); (GDestroyNotify) _free_glmixer_frame_data);
@ -1338,9 +1335,6 @@ gst_gl_mixer_stop (GstAggregator * agg)
GstGLMixer *mix = GST_GL_MIXER (agg); GstGLMixer *mix = GST_GL_MIXER (agg);
GstGLMixerClass *mixer_class = GST_GL_MIXER_GET_CLASS (mix); GstGLMixerClass *mixer_class = GST_GL_MIXER_GET_CLASS (mix);
if (!GST_AGGREGATOR_CLASS (parent_class)->stop (agg))
return FALSE;
GST_OBJECT_LOCK (agg); GST_OBJECT_LOCK (agg);
g_ptr_array_free (mix->frames, TRUE); g_ptr_array_free (mix->frames, TRUE);
mix->frames = NULL; mix->frames = NULL;