diff options
| author | Thibault Saunier <thibault.saunier@osg.samsung.com> | 2016-10-11 00:59:47 +0200 |
|---|---|---|
| committer | Thibault Saunier <thibault.saunier@osg.samsung.com> | 2016-10-11 19:25:51 +0200 |
| commit | 4432efcfad04cc87ea944f860d22c449b02df26d (patch) | |
| tree | 9634340c715c5925c8be91d2776426ff99845ff6 | |
| parent | aec1442d4cc9902e5e5ce1fe1a08acd5f9e9af2e (diff) | |
track-element: Avoid dereferencing NULL pointer
We set TrackElement track type very early when creating effects
so it now uses that information to find TrackElement in clips
by track type.
Reviewed-by: Alex Băluț <alexandru.balut@gmail.com>
Differential Revision: https://phabricator.freedesktop.org/D1370
| -rw-r--r-- | ges/ges-clip.c | 2 | ||||
| -rw-r--r-- | ges/ges-track-element.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ges/ges-clip.c b/ges/ges-clip.c index d0b47fa5..b810156d 100644 --- a/ges/ges-clip.c +++ b/ges/ges-clip.c @@ -1623,7 +1623,7 @@ ges_clip_find_track_elements (GESClip * clip, GESTrack * track, tmptrack = ges_track_element_get_track (otmp); if (((track != NULL && tmptrack == track)) || (track_type != GES_TRACK_TYPE_UNKNOWN - && tmptrack->type == track_type)) { + && ges_track_element_get_track_type (otmp) == track_type)) { foundElement = GES_TRACK_ELEMENT (tmp->data); diff --git a/ges/ges-track-element.c b/ges/ges-track-element.c index 6fe5c9b4..21f6ca46 100644 --- a/ges/ges-track-element.c +++ b/ges/ges-track-element.c @@ -815,6 +815,8 @@ ges_track_element_set_track (GESTrackElement * object, GESTrack * track) object->priv->track = track; if (object->priv->track) { + ges_track_element_set_track_type (object, track->type); + g_object_set (object->priv->nleobject, "caps", ges_track_get_caps (object->priv->track), NULL); } |