| commit | 509dddd33f915c0a1c2b58beb17daf0f96b58a88 | |
| author | Uoti Urpala <uau@mplayer2.org> | |
| Wed, 3 Oct 2012 00:18:16 +0000 (3 03:18 +0300) | ||
| committer | Uoti Urpala <uau@mplayer2.org> | |
| Fri, 5 Oct 2012 16:19:06 +0000 (5 19:19 +0300) | ||
| tree | 059d1693ee5ecc78ce83f370f6a1b9668846c5ab | treesnapshot (tar.gz zip) |
| parent | dba4199dd3eee8e477c08180240d7bc0db063005 | commitdiff |
mixer: fix crash when muted and audio init fails
uninit_player() called both mixer_uninit() and ao_uninit() under
"if (mpctx->ao)". However, if AO or filter chain initialization fails
in reinit_audio_chain(), then mpctx->ao is set but mpctx->mixer->ao is
not. mixer_uninit() crashed in this case. Make mixer_uninit() a no-op
if no AO is set in the mixer. Also make the call to mixer_unit() in
uninit_player() unconditional, as calling it is now always safe.
uninit_player() called both mixer_uninit() and ao_uninit() under
"if (mpctx->ao)". However, if AO or filter chain initialization fails
in reinit_audio_chain(), then mpctx->ao is set but mpctx->mixer->ao is
not. mixer_uninit() crashed in this case. Make mixer_uninit() a no-op
if no AO is set in the mixer. Also make the call to mixer_unit() in
uninit_player() unconditional, as calling it is now always safe.
| mixer.c | diffblobblamehistory | |
| mplayer.c | diffblobblamehistory |