[vlc-commits] audio_output: drain/flush aout filters on flush

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Nov  3 15:28:48 2015 +0100| [5ad44ad0c22d17338d5fb17c31147b4083f2074d] | committer: Thomas Guillem

audio_output: drain/flush aout filters on flush

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5ad44ad0c22d17338d5fb17c31147b4083f2074d
---

 src/audio_output/dec.c |   10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c
index 9e356aa..9d4958b 100644
--- a/src/audio_output/dec.c
+++ b/src/audio_output/dec.c
@@ -425,6 +425,16 @@ void aout_DecFlush (audio_output_t *aout, bool wait)
     aout_OutputLock (aout);
     owner->sync.end = VLC_TS_INVALID;
     if (owner->mixer_format.i_format)
+    {
+        if (wait)
+        {
+            block_t *block = aout_FiltersDrain (owner->filters);
+            if (block)
+                aout_OutputPlay (aout, block);
+        }
+        else
+            aout_FiltersFlush (owner->filters);
         aout_OutputFlush (aout, wait);
+    }
     aout_OutputUnlock (aout);
 }