diff options
| author | Thibault Saunier <thibault.saunier@collabora.com> | 2011-12-06 18:04:11 -0300 |
|---|---|---|
| committer | Thibault Saunier <thibault.saunier@collabora.com> | 2012-01-11 11:56:15 -0300 |
| commit | 2fe6210383448f79f28e4259f3d133a01498c049 (patch) | |
| tree | 24a54798bbd3be4d04f71dca1b265a7eeec553ca | |
| parent | 7212307db5e4e9fb2cdfda3c94b7a8d7d90e004e (diff) | |
ges: Make sure not to set transition start to negative
gnlobject.start is a guint64, we can not set it to a negative value
| -rw-r--r-- | ges/ges-simple-timeline-layer.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ges/ges-simple-timeline-layer.c b/ges/ges-simple-timeline-layer.c index 104580b4..6a38170a 100644 --- a/ges/ges-simple-timeline-layer.c +++ b/ges/ges-simple-timeline-layer.c @@ -163,7 +163,7 @@ static void gstl_recalculate (GESSimpleTimelineLayer * self) { GList *tmp; - GstClockTime pos = 0; + gint64 pos = 0; gint priority = 0; gint transition_priority = 0; gint height; @@ -210,9 +210,11 @@ gstl_recalculate (GESSimpleTimelineLayer * self) } else if (GES_IS_TIMELINE_TRANSITION (obj)) { pos -= dur; + if (pos < 0) + pos = 0; - GST_LOG ("%p obj: height: %d: trans_priority %d", obj, height, - transition_priority); + GST_LOG ("%p obj: height: %d: trans_priority %d Position: %d, " + "duration %d", obj, height, transition_priority, pos); g_assert (transition_priority != -1); |