From ba477698233ff5f408a4d4662d9e732193ae08d0 Mon Sep 17 00:00:00 2001
From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Fri, 12 Oct 2012 17:51:51 +0200
Subject: [PATCH] mpegdemux: tweak flow return aggregation

---
 gst/mpegdemux/gstmpegdemux.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gst/mpegdemux/gstmpegdemux.c b/gst/mpegdemux/gstmpegdemux.c
index 0e276eb486..7afd7776bb 100644
--- a/gst/mpegdemux/gstmpegdemux.c
+++ b/gst/mpegdemux/gstmpegdemux.c
@@ -2925,6 +2925,11 @@ gst_flups_demux_combine_flows (GstFluPSDemux * demux, GstFlowReturn ret)
     ret = stream->last_flow;
     streams++;
 
+    /* some streams may still have to appear,
+     * and only those ones may end up linked */
+    if (G_UNLIKELY (demux->need_no_more_pads && ret == GST_FLOW_NOT_LINKED))
+      ret = GST_FLOW_OK;
+
     /* no unexpected or unlinked, return */
     if (G_LIKELY (ret != GST_FLOW_EOS && ret != GST_FLOW_NOT_LINKED))
       goto done;