mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

avidemux: resurrect some flow return handling

Browse source
This commit is contained in:
Mark Nauwelaerts 2015-02-21 20:05:24 +01:00
parent 5ead23a14a
commit d0587467fc
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/avi/gstavidemux.c
View file

@ -4634,6 +4634,8 @@ gst_avi_demux_handle_seek (GstAviDemux * avi, GstPad * pad, GstEvent * event)
GST_DEBUG_OBJECT (avi, "marking DISCONT"); GST_DEBUG_OBJECT (avi, "marking DISCONT");
avi->stream[i].discont = TRUE; avi->stream[i].discont = TRUE;
} }
/* likewise for the whole new segment */
gst_flow_combiner_reset (avi->flowcombiner);
GST_PAD_STREAM_UNLOCK (avi->sinkpad); GST_PAD_STREAM_UNLOCK (avi->sinkpad);
return TRUE; 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_LOG_OBJECT (avi, "Stream %s:%s flow return: %s",
GST_DEBUG_PAD_NAME (stream->pad), gst_flow_get_name (ret)); 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)); GST_LOG_OBJECT (avi, "combined to return %s", gst_flow_get_name (ret));
return ret; return ret;