From df2982ce7da4f3b425fe3e7901b7a9960a39b1eb Mon Sep 17 00:00:00 2001 From: Mark Nauwelaerts Date: Thu, 9 Dec 2010 13:49:04 +0100 Subject: [PATCH] qtdemux: fix flow return aggregation --- gst/qtdemux/qtdemux.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index 134188e..a744fbc 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -3248,6 +3248,11 @@ gst_qtdemux_combine_flows (GstQTDemux * demux, QtDemuxStream * stream, /* store the value */ stream->last_ret = ret; + /* any other error that is not-linked or eos can be returned right away */ + if (G_LIKELY (ret != GST_FLOW_UNEXPECTED && ret != GST_FLOW_NOT_LINKED)) + goto done; + + /* only return NOT_LINKED if all other pads returned NOT_LINKED */ for (i = 0; i < demux->n_streams; i++) { QtDemuxStream *ostream = demux->streams[i]; -- 2.7.4