[vlc-commits] aout: the stop implementation is now mandatory

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Mar 19 15:54:56 2019 +0100| [282c9fd3ade848bfc505350a8d16bd7a8ff2484f] | committer: Thomas Guillem

aout: the stop implementation is now mandatory

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

 include/vlc_aout.h        | 2 +-
 src/audio_output/output.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/vlc_aout.h b/include/vlc_aout.h
index a6b8069151..fb0edd6de6 100644
--- a/include/vlc_aout.h
+++ b/include/vlc_aout.h
@@ -159,7 +159,7 @@ struct audio_output
       */
 
     void (*stop)(audio_output_t *);
-    /**< Stops the existing stream (optional, may be NULL).
+    /**< Stops the existing stream (mandatory, cannot be NULL).
       *
       * This callback terminates the current audio stream,
       * and returns the audio output to stopped state.
diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index 43e8c25a08..e7ea4788b0 100644
--- a/src/audio_output/output.c
+++ b/src/audio_output/output.c
@@ -609,8 +609,7 @@ int aout_OutputNew (audio_output_t *aout, audio_sample_format_t *restrict fmt,
 void aout_OutputDelete (audio_output_t *aout)
 {
     aout_OutputLock(aout);
-    if (aout->stop != NULL)
-        aout->stop (aout);
+    aout->stop (aout);
     aout_OutputUnlock(aout);
 }