From 460bf61345bba8691f66b9b316cfff75384055ec Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Fri, 27 Feb 2015 22:39:42 +0100 Subject: [PATCH] validate:scenario: Set the main action structure in fill_structure Reviewers: Mathieu_Du Differential Revision: http://phabricator.freedesktop.org/D71 --- validate/gst/validate/gst-validate-scenario.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/validate/gst/validate/gst-validate-scenario.c b/validate/gst/validate/gst-validate-scenario.c index f9daea43af..48c3a48e90 100644 --- a/validate/gst/validate/gst-validate-scenario.c +++ b/validate/gst/validate/gst-validate-scenario.c @@ -1043,7 +1043,6 @@ _set_action_playback_time (GstValidateScenario * scenario, return TRUE; } - static GstValidateExecuteActionReturn _fill_action (GstValidateScenario * scenario, GstValidateAction * action, GstStructure * structure, gboolean add_to_lists) @@ -1086,6 +1085,9 @@ _fill_action (GstValidateScenario * scenario, GstValidateAction * action, action->structure = gst_structure_copy (structure); + if (!action->priv->main_structure) + action->priv->main_structure = gst_structure_copy (structure); + if (IS_CONFIG_ACTION_TYPE (action_type->flags)) { res = action_type->execute (scenario, action); gst_validate_action_unref (action); @@ -1115,7 +1117,6 @@ _fill_action (GstValidateScenario * scenario, GstValidateAction * action, return res; } - static GstValidateExecuteActionReturn _execute_sub_action_action (GstValidateAction * action) { @@ -1859,7 +1860,6 @@ _load_scenario_file (GstValidateScenario * scenario, structure, TRUE) == GST_VALIDATE_EXECUTE_ACTION_ERROR) goto failed; - action->priv->main_structure = gst_structure_copy (structure); action->action_number = priv->num_actions++; }