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:
100276d
)
timeline: Not being able to trim and object is an error
author
Thibault Saunier
<tsaunier@igalia.com>
Fri, 8 Feb 2019 20:44:40 +0000
(17:44 -0300)
committer
Thibault Saunier
<tsaunier@gnome.org>
Fri, 15 Mar 2019 23:51:55 +0000
(23:51 +0000)
So error out when that happens.
ges/ges-timeline.c
patch
|
blob
|
history
diff --git
a/ges/ges-timeline.c
b/ges/ges-timeline.c
index f45343a18ce47c6765629880fed1fd2f96a9276c..4e273e640fc3097b09e11269ceb27ea86d677576 100644
(file)
--- a/
ges/ges-timeline.c
+++ b/
ges/ges-timeline.c
@@
-1864,7
+1864,8
@@
timeline_ripple_object (GESTimeline * timeline, GESTrackElement * obj,
case GES_EDGE_START:
GST_INFO ("Ripple start doesn't make sense, trimming instead");
timeline->priv->movecontext.needs_move_ctx = TRUE;
- timeline_trim_object (timeline, obj, layers, edge, position);
+ if (!timeline_trim_object (timeline, obj, layers, edge, position))
+ goto error;
break;
default:
GST_DEBUG ("Can not ripple edge: %i", edge);