From d0587467fc383c4840a6fda3a06829fee507d499 Mon Sep 17 00:00:00 2001 From: Mark Nauwelaerts Date: Sat, 21 Feb 2015 20:05:24 +0100 Subject: [PATCH] avidemux: resurrect some flow return handling --- gst/avi/gstavidemux.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index ce965de..29e364b 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -4634,6 +4634,8 @@ gst_avi_demux_handle_seek (GstAviDemux * avi, GstPad * pad, GstEvent * event) GST_DEBUG_OBJECT (avi, "marking DISCONT"); avi->stream[i].discont = TRUE; } + /* likewise for the whole new segment */ + gst_flow_combiner_reset (avi->flowcombiner); GST_PAD_STREAM_UNLOCK (avi->sinkpad); return TRUE; @@ -4998,7 +5000,7 @@ gst_avi_demux_combine_flows (GstAviDemux * avi, GstAviStream * stream, { GST_LOG_OBJECT (avi, "Stream %s:%s flow return: %s", GST_DEBUG_PAD_NAME (stream->pad), gst_flow_get_name (ret)); - ret = gst_flow_combiner_update_flow (avi->flowcombiner, ret); + ret = gst_flow_combiner_update_pad_flow (avi->flowcombiner, stream->pad, ret); GST_LOG_OBJECT (avi, "combined to return %s", gst_flow_get_name (ret)); return ret; -- 2.7.4