[vlc-commits] aout: move last flush to aout_DecDelete

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Mar 13 11:34:41 2019 +0100| [440e21656f7d2393918bfa78620e482f4fa8d1a3] | committer: Thomas Guillem

aout: move last flush to aout_DecDelete

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

 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..52de2e2e7c 100644
--- a/src/audio_output/dec.c
+++ b/src/audio_output/dec.c
@@ -122,6 +122,7 @@ void aout_DecDelete (audio_output_t *aout)
 
     if (owner->mixer_format.i_format)
     {
+        aout_DecFlush(aout, false);
         aout_FiltersDelete (aout, owner->filters);
         aout_OutputDelete (aout);
     }
diff --git a/src/input/decoder.c b/src/input/decoder.c
index 5d09a3ead6..bc9d9b5234 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -1932,7 +1932,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 );
             }