diff options
| author | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-10-12 17:51:51 +0200 |
|---|---|---|
| committer | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-10-12 17:51:51 +0200 |
| commit | ba477698233ff5f408a4d4662d9e732193ae08d0 (patch) | |
| tree | a5935f241f11e6faeeda98f00d57ad0b51bc85a0 /gst | |
| parent | a9c0609ae84960edc47469c423b03eebac00ded7 (diff) | |
| download | gstreamer-plugins-bad-ba477698233ff5f408a4d4662d9e732193ae08d0.tar.gz | |
mpegdemux: tweak flow return aggregation
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/mpegdemux/gstmpegdemux.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gst/mpegdemux/gstmpegdemux.c b/gst/mpegdemux/gstmpegdemux.c index 0e276eb48..7afd7776b 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; |