From 0340c7e1f8e660dbc46ab3f258bddca7d73ad6b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 8 Aug 2018 12:44:55 +0200 Subject: [PATCH] tagdemux: Propagate flow returns from gst_type_find_helper_get_range() properly Instead of considering every failed typefinding as an error, even in case of e.g. GST_FLOW_FLUSHING. --- gst-libs/gst/tag/gsttagdemux.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c index 5af245304d..1443ff9da9 100644 --- a/gst-libs/gst/tag/gsttagdemux.c +++ b/gst-libs/gst/tag/gsttagdemux.c @@ -1365,11 +1365,13 @@ gst_tag_demux_element_find (GstTagDemux * demux) if (GST_PAD_MODE (demux->priv->srcpad) == GST_PAD_MODE_PULL) goto skip_typefinding; - caps = gst_type_find_helper_get_range (GST_OBJECT (demux), NULL, + ret = gst_type_find_helper_get_range_full (GST_OBJECT (demux), NULL, (GstTypeFindHelperGetRangeFunction) gst_tag_demux_read_range, demux->priv->upstream_size - (demux->priv->strip_start + demux->priv->strip_end), NULL, - &probability); + &caps, &probability); + if (ret != GST_FLOW_OK) + goto read_tag_error; GST_INFO_OBJECT (demux, "Found type %" GST_PTR_FORMAT " with a " "probability of %u", caps, probability);