projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
73e4e3b
)
timeline: Never create transition between elements inside the moving context
author
Thibault Saunier
<tsaunier@gnome.org>
Fri, 5 Jun 2015 17:58:16 +0000
(19:58 +0200)
committer
Thibault Saunier
<tsaunier@gnome.org>
Fri, 5 Jun 2015 20:52:57 +0000
(22:52 +0200)
http://phabricator.freedesktop.org/T74
ges/ges-timeline.c
patch
|
blob
|
history
diff --git
a/ges/ges-timeline.c
b/ges/ges-timeline.c
index
41d0c07
..
021669d
100644
(file)
--- a/
ges/ges-timeline.c
+++ b/
ges/ges-timeline.c
@@
-963,6
+963,9
@@
_create_transitions_on_layer (GESTimeline * timeline, GESLayer * layer,
== toplevel)
continue;
+ if (g_list_find (priv->movecontext.moving_trackelements, next))
+ continue;
+
transition_duration = (_START (prev) + _DURATION (prev)) - _START (next);
if (transition_duration > 0 && transition_duration < _DURATION (prev) &&
transition_duration < _DURATION (next)) {