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

[reimar]

Author: reimar
Date: Fri Nov 13 14:21:59 2009
New Revision: 29908

Log:
Check that mpctx->audio_out is not NULL when trying to uninit it.
Make audio uninit consistent with e.g. the demuxer uninit code and
also avoids a possible crash.

Modified:
   trunk/mplayer.c

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Fri Nov 13 08:54:30 2009	(r29907)
+++ trunk/mplayer.c	Fri Nov 13 14:21:59 2009	(r29908)
@@ -649,7 +649,8 @@ void uninit_player(unsigned int mask){
     initialized_flags&=~INITIALIZED_AO;
     current_module="uninit_ao";
     if (mpctx->edl_muted) mixer_mute(&mpctx->mixer);
-    mpctx->audio_out->uninit(mpctx->eof?0:1); mpctx->audio_out=NULL;
+    if (mpctx->audio_out) mpctx->audio_out->uninit(mpctx->eof?0:1);
+    mpctx->audio_out=NULL;
   }
 
 #ifdef CONFIG_GUI