From 8f405d6a4d3b9ac61590b97e9b5afdb66ace49bb Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Thu, 1 Dec 2011 00:33:38 -0300 Subject: [PATCH] ges: Handle supported formats in TimelineStandardTransition --- ges/ges-timeline-standard-transition.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ges/ges-timeline-standard-transition.c b/ges/ges-timeline-standard-transition.c index 713b82a08a..b2e2b71504 100644 --- a/ges/ges-timeline-standard-transition.c +++ b/ges/ges-timeline-standard-transition.c @@ -192,16 +192,21 @@ ges_tl_transition_create_track_object (GESTimelineObject * obj, GESTimelineStandardTransition *transition = (GESTimelineStandardTransition *) obj; GESTrackObject *res; + GESTrackType supportedformats; GST_DEBUG ("Creating a GESTrackTransition"); - if (track->type == GES_TRACK_TYPE_VIDEO) { + supportedformats = ges_timeline_object_get_supported_formats (obj); + if (track->type == GES_TRACK_TYPE_VIDEO && + (supportedformats == GES_TRACK_TYPE_UNKNOWN || + supportedformats & GES_TRACK_TYPE_VIDEO)) { res = GES_TRACK_OBJECT (ges_track_video_transition_new ()); ges_track_video_transition_set_transition_type ((GESTrackVideoTransition *) res, transition->vtype); - } - else if (track->type == GES_TRACK_TYPE_AUDIO) { + } else if (track->type == GES_TRACK_TYPE_AUDIO && + (supportedformats == GES_TRACK_TYPE_UNKNOWN || + supportedformats & GES_TRACK_TYPE_AUDIO)) { res = GES_TRACK_OBJECT (ges_track_audio_transition_new ()); } -- 2.34.1