diff options
| author | Thibault Saunier <tsaunier@igalia.com> | 2020-03-11 19:38:19 -0300 |
|---|---|---|
| committer | Thibault Saunier <tsaunier@igalia.com> | 2020-03-11 22:44:52 +0000 |
| commit | 41be342ba880e244be8b5038d791419ee84dd543 (patch) | |
| tree | 2ede626b7005fe8e656dd0d4876fe8ebbcaf98b3 /plugins | |
| parent | ec2325ee9b795910d65a971fd22d350415809200 (diff) | |
nle: Delay marking object as not in composition
Instead of doing it at the time of resetting `object->in_composition`
when user calls `gst_bin_remove` do it after we actually removed
it from the object thread, and do it in the `nle_object_reset`
method where it belongs
Fixes https://gitlab.freedesktop.org/gstreamer/gst-editing-services/issues/96
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/nle/nlecomposition.c | 1 | ||||
| -rw-r--r-- | plugins/nle/nleobject.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/plugins/nle/nlecomposition.c b/plugins/nle/nlecomposition.c index d0f838f3..3e7b079b 100644 --- a/plugins/nle/nlecomposition.c +++ b/plugins/nle/nlecomposition.c @@ -3543,7 +3543,6 @@ nle_composition_remove_object (GstBin * bin, GstElement * element) object = NLE_OBJECT (element); - object->in_composition = FALSE; _add_remove_object_action (comp, object); return TRUE; diff --git a/plugins/nle/nleobject.c b/plugins/nle/nleobject.c index 8e166405..6e16f8e0 100644 --- a/plugins/nle/nleobject.c +++ b/plugins/nle/nleobject.c @@ -738,6 +738,7 @@ nle_object_reset (NleObject * object) object->inpoint = GST_CLOCK_TIME_NONE; object->priority = 0; object->active = TRUE; + object->in_composition = FALSE; } GType |