[vlc-devel] [PATCH 1/8] aout: always flush from aout_DecDelete

[Thomas Guillem]

---
 src/audio_output/dec.c | 1 +
 src/input/decoder.c    | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c
index 5295644891..46d76bc872 100644
--- a/src/audio_output/dec.c
+++ b/src/audio_output/dec.c
@@ -118,6 +118,7 @@ error:
  */
 void aout_DecDelete (audio_output_t *aout)
 {
+    aout_DecFlush( aout, false );
     aout_owner_t *owner = aout_owner (aout);
 
     if (owner->mixer_format.i_format)
diff --git a/src/input/decoder.c b/src/input/decoder.c
index cf7fd43995..e6eded1df0 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -1933,7 +1933,6 @@ static void DeleteDecoder( decoder_t * p_dec )
             if( p_owner->p_aout )
             {
                 /* TODO: REVISIT gap-less audio */
-                aout_DecFlush( p_owner->p_aout, false );
                 aout_DecDelete( p_owner->p_aout );
                 input_resource_PutAout( p_owner->p_resource, p_owner->p_aout );
             }
-- 
2.20.1