summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-10-16 01:03:02 +0200
committerwm4 <wm4@nowhere>2014-10-16 01:03:02 +0200
commit0e0dc5c5be4a93b05518668b4487d8bc8c16cae1 (patch)
tree18d415bf492406a4013436e12c722d1cbf5bd850 /player
parent5a6a5695bbcedf402cc8b23d6a990c8bd3faa670 (diff)
downloadmpv-0e0dc5c5be4a93b05518668b4487d8bc8c16cae1.tar.bz2
mpv-0e0dc5c5be4a93b05518668b4487d8bc8c16cae1.tar.xz
player: fix crash on early audio uninit
Could crash when exiting playback in very early stages of initialization. CC: @mpv-player/stable
Diffstat (limited to 'player')
-rw-r--r--player/audio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/player/audio.c b/player/audio.c
index e5cdd671e5..50b2de9724 100644
--- a/player/audio.c
+++ b/player/audio.c
@@ -593,8 +593,8 @@ void fill_audio_out_buffers(struct MPContext *mpctx, double endpts)
// Drop data queued for output, or which the AO is currently outputting.
void clear_audio_output_buffers(struct MPContext *mpctx)
{
- if (mpctx->ao) {
+ if (mpctx->ao)
ao_reset(mpctx->ao);
+ if (mpctx->ao_buffer)
mp_audio_buffer_clear(mpctx->ao_buffer);
- }
}