From b488a560ed80dcba11d79a2968e3870a47b9d30c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Olivier=20Cr=C3=AAte?= Date: Sun, 21 May 2017 12:41:53 +0200 Subject: [PATCH] videoaggregator: Return to parent on reconfigure The caps negotiation is now in the parent, so need to return there if a reconfiguration is needed, otherwise it will loops forever. --- gst-libs/gst/video/gstvideoaggregator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c index 7cdce00fa6..c731f92f1a 100644 --- a/gst-libs/gst/video/gstvideoaggregator.c +++ b/gst-libs/gst/video/gstvideoaggregator.c @@ -1445,7 +1445,6 @@ gst_video_aggregator_aggregate (GstAggregator * agg, gboolean timeout) GST_VIDEO_AGGREGATOR_LOCK (vagg); -restart: if (GST_VIDEO_INFO_FORMAT (&vagg->info) == GST_VIDEO_FORMAT_UNKNOWN) { if (timeout) gst_video_aggregator_advance_on_timeout (vagg); @@ -1510,7 +1509,8 @@ restart: */ if (gst_pad_needs_reconfigure (GST_AGGREGATOR_SRC_PAD (vagg))) { GST_DEBUG_OBJECT (vagg, "Need reconfigure"); - goto restart; + flow_ret = GST_AGGREGATOR_FLOW_NEED_DATA; + goto unlock_and_return; } GST_DEBUG_OBJECT (vagg, -- 2.34.1