summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-11-13 13:21:59 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-11-13 13:21:59 +0000
commitfd35beaf0a51a45dc0df3e748edd196b56918283 (patch)
tree59ee143a5587d76076981d1965e06d2f96481c6f /mplayer.c
parent327414a2145356263b474a9b57cd2b05368fc49b (diff)
downloadmpv-fd35beaf0a51a45dc0df3e748edd196b56918283.tar.bz2
mpv-fd35beaf0a51a45dc0df3e748edd196b56918283.tar.xz
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. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29908 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mplayer.c b/mplayer.c
index ee58b03660..91de264af0 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -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