From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Thu, 9 Dec 2010 12:49:04 +0000 (+0100)
Subject: qtdemux: fix flow return aggregation
X-Git-Tag: RELEASE-0.10.27~243
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=df2982ce7da4f3b425fe3e7901b7a9960a39b1eb;p=platform%2Fupstream%2Fgst-plugins-good.git

qtdemux: fix flow return aggregation
---

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];