# HG changeset patch # User reimar # Date 1258118519 0 # Node ID 32af1e6ef8d377d2acc5ef8fd2690b7e853eff00 # Parent a5deeffff4d0f09027db775aeaad5298f674bc18 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. diff -r a5deeffff4d0 -r 32af1e6ef8d3 mplayer.c --- a/mplayer.c Fri Nov 13 07:54:30 2009 +0000 +++ b/mplayer.c Fri Nov 13 13:21:59 2009 +0000 @@ -649,7 +649,8 @@ 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