From 33f412d6db589a2cdfdefd403f5d6d4e7c8f4107 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Olivier=20Cr=C3=AAte?= Date: Wed, 21 Jan 2015 18:39:24 -0500 Subject: [PATCH] audiomixer: Don't reset caps on flush A flush event doesn't invalidate the previous caps event. https://bugzilla.gnome.org/show_bug.cgi?id=742684 --- gst/audiomixer/gstaudiomixer.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gst/audiomixer/gstaudiomixer.c b/gst/audiomixer/gstaudiomixer.c index 01521e5..44ec155 100644 --- a/gst/audiomixer/gstaudiomixer.c +++ b/gst/audiomixer/gstaudiomixer.c @@ -751,7 +751,11 @@ gst_audiomixer_stop (GstAggregator * agg) static GstFlowReturn gst_audiomixer_flush (GstAggregator * agg) { - gst_audiomixer_reset (GST_AUDIO_MIXER (agg)); + GstAudioMixer *audiomixer = GST_AUDIO_MIXER (agg); + + audiomixer->offset = 0; + agg->segment.position = -1; + gst_buffer_replace (&audiomixer->current_buffer, NULL); return GST_FLOW_OK; } -- 2.7.4