From 440e21656f7d2393918bfa78620e482f4fa8d1a3 Mon Sep 17 00:00:00 2001 From: Thomas Guillem <thomas@gllm.fr> Date: Wed, 13 Mar 2019 11:34:41 +0100 Subject: [PATCH] aout: move last flush to aout_DecDelete --- 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 52956448910a..52de2e2e7c55 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 5d09a3ead6a0..bc9d9b5234de 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 ); } -- GitLab