[MPlayer-cvslog] r38415 - trunk/mplayer.c

al subversion at mplayerhq.hu
Sat Apr 8 22:47:31 EEST 2023

Author: al
Date: Sat Apr  8 22:47:31 2023
New Revision: 38415

mplayer: uninit_player: Also set the ao pointer in the mixer to NULL

This avoids the problem addressed in the previous commit (r38414) by
making sure we don't call into AOs that were uninitialized.

Unfortunately it's not sufficient and causes a regression for AOs
where the call (even when the AO was already uninitialized) would
still work and unmute the audio (e.g. ao alsa).

So for example if a file is played with ao alsa and exits in muted
state. The mute will not be reversed and the alsa output device will
stay muted. If this is the user's main audio output device it would
usually mean the audio is completely muted for her system because
alsa is usually **the** low level audio device on her Linux system
used by everything else as well.

Patch by Reimar


Modified: trunk/mplayer.c
--- trunk/mplayer.c	Sat Apr  8 22:42:20 2023	(r38414)
+++ trunk/mplayer.c	Sat Apr  8 22:47:31 2023	(r38415)
@@ -672,6 +672,7 @@ void uninit_player(unsigned int mask)
         if (mpctx->audio_out)
             mpctx->audio_out->uninit(mpctx->eof ? 0 : 1);
         mpctx->audio_out = NULL;
+        mpctx->mixer.audio_out = NULL;
 #ifdef CONFIG_GUI

More information about the MPlayer-cvslog mailing list