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

clip: Avoid corruption of our list of children while ungrouping

Browse source
This commit is contained in:
Thibault Saunier 2013-05-05 11:13:24 +01:00
parent 086bbd3b38
commit ef4efa505f
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ges/ges-clip.c
View file

@ -196,12 +196,12 @@ add_tlobj_to_list (gpointer key, gpointer tlobj, GList ** list)
static GList * static GList *
_ungroup (GESContainer * container, gboolean recursive) _ungroup (GESContainer * container, gboolean recursive)
{ {
GList *tmp, *ret = NULL;
GESClip *tmpclip; GESClip *tmpclip;
GESTrackType track_type; GESTrackType track_type;
GESTrackElement *track_element; GESTrackElement *track_element;
gboolean first_obj = TRUE; gboolean first_obj = TRUE;
GList *tmp, *children, *ret = NULL;
GESClip *clip = GES_CLIP (container); GESClip *clip = GES_CLIP (container);
GESTimelineElement *element = GES_TIMELINE_ELEMENT (container); GESTimelineElement *element = GES_TIMELINE_ELEMENT (container);
GESLayer *layer = clip->priv->layer; GESLayer *layer = clip->priv->layer;
@ -214,7 +214,8 @@ _ungroup (GESContainer * container, gboolean recursive)
} }
/* We need a copy of the current list of tracks */ /* We need a copy of the current list of tracks */
for (tmp = GES_CONTAINER_CHILDREN (container); tmp; tmp = tmp->next) { children = ges_container_get_children (container);
for (tmp = children; tmp; tmp = tmp->next) {
track_element = GES_TRACK_ELEMENT (tmp->data); track_element = GES_TRACK_ELEMENT (tmp->data);
track_type = ges_track_element_get_track_type (track_element); track_type = ges_track_element_get_track_type (track_element);
@ -247,6 +248,7 @@ _ungroup (GESContainer * container, gboolean recursive)
gst_object_unref (track_element); gst_object_unref (track_element);
} }
} }
g_list_free_full (children, gst_object_unref);
g_hash_table_foreach (_tracktype_clip, (GHFunc) add_tlobj_to_list, &ret); g_hash_table_foreach (_tracktype_clip, (GHFunc) add_tlobj_to_list, &ret);
g_hash_table_unref (_tracktype_clip); g_hash_table_unref (_tracktype_clip);