mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 18:21:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

timeline-layer: Do not call track_get_by_layer when track == NULL

Browse source
This commit is contained in:
Thibault Saunier 2012-03-30 03:36:27 -04:00
parent 54aac450da
commit 13a2857db7
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ges/ges-timeline-layer.c
View file

@ -512,25 +512,30 @@ static void
calculate_next_transition (GESTrackObject * track_object, calculate_next_transition (GESTrackObject * track_object,
GESTimelineLayer * layer) GESTimelineLayer * layer)
{ {
GESTrack *track = ges_track_object_get_track (track_object); GESTrack *track;
GList *tckobjs_in_layer = track_get_by_layer (layer, track); GList *tckobjs_in_layer;
if (ges_track_object_get_track (track_object)) { if ((track = ges_track_object_get_track (track_object))) {
tckobjs_in_layer = track_get_by_layer (layer, track);
calculate_next_transition_with_list (track_object, tckobjs_in_layer, layer); calculate_next_transition_with_list (track_object, tckobjs_in_layer, layer);
}
g_list_foreach (tckobjs_in_layer, (GFunc) g_object_unref, NULL); g_list_foreach (tckobjs_in_layer, (GFunc) g_object_unref, NULL);
g_list_free (tckobjs_in_layer); g_list_free (tckobjs_in_layer);
}
} }
static void static void
calculate_transitions (GESTrackObject * track_object) calculate_transitions (GESTrackObject * track_object)
{ {
GList *tckobjs_in_layer, *compared; GList *tckobjs_in_layer, *compared;
GESTrack *track = ges_track_object_get_track (track_object);
GESTimelineLayer *layer; GESTimelineLayer *layer;
GESTimelineObject *tlobj; GESTimelineObject *tlobj;
GESTrack *track = ges_track_object_get_track (track_object);
if (track == NULL)
return;
tlobj = ges_track_object_get_timeline_object (track_object); tlobj = ges_track_object_get_timeline_object (track_object);
layer = ges_timeline_object_get_layer (tlobj); layer = ges_timeline_object_get_layer (tlobj);
tckobjs_in_layer = track_get_by_layer (layer, track); tckobjs_in_layer = track_get_by_layer (layer, track);