From bc418c7a85caf63e891ab54ee688356d686eccc8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 18 Dec 2014 23:33:58 +0100 Subject: [PATCH] audiomixer: We're only EOS if all our pads are actually EOS Having a buffer or not on the pad is irrelevant. --- gst/audiomixer/gstaudiomixer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gst/audiomixer/gstaudiomixer.c b/gst/audiomixer/gstaudiomixer.c index e219132..0e8c306 100644 --- a/gst/audiomixer/gstaudiomixer.c +++ b/gst/audiomixer/gstaudiomixer.c @@ -1430,6 +1430,9 @@ gst_audiomixer_aggregate (GstAggregator * agg, gboolean timeout) GstAudioMixerPad *pad = GST_AUDIO_MIXER_PAD (iter->data); GstAggregatorPad *aggpad = GST_AGGREGATOR_PAD (iter->data); + if (!GST_AGGREGATOR_PAD (pad)->eos) + is_eos = FALSE; + inbuf = gst_aggregator_pad_get_buffer (aggpad); if (!inbuf) continue; @@ -1450,8 +1453,6 @@ gst_audiomixer_aggregate (GstAggregator * agg, gboolean timeout) if (!pad->buffer && !dropped && GST_AGGREGATOR_PAD (pad)->eos) { GST_DEBUG_OBJECT (aggpad, "Pad is in EOS state"); continue; - } else { - is_eos = FALSE; } g_assert (pad->buffer); -- 2.7.4