summaryrefslogtreecommitdiffstats
path: root/audio/out
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-10-05 23:05:54 +0200
committerwm4 <wm4@nowhere>2014-10-05 23:05:54 +0200
commit9e3e5ca59888cc844e0d8de8bdfb65c9d92084a7 (patch)
treec154c0239cbc55ced8967ad84d2dc450685a3c42 /audio/out
parentea83a2b9bc626b8a014c00218414e257ab5f4972 (diff)
downloadmpv-9e3e5ca59888cc844e0d8de8bdfb65c9d92084a7.tar.bz2
mpv-9e3e5ca59888cc844e0d8de8bdfb65c9d92084a7.tar.xz
audio/out/push: fix some AOs freezing on exit
Caused by a dumb deadlock.
Diffstat (limited to 'audio/out')
-rw-r--r--audio/out/push.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/audio/out/push.c b/audio/out/push.c
index b4c1ab3950..55359cf4fe 100644
--- a/audio/out/push.c
+++ b/audio/out/push.c
@@ -165,7 +165,7 @@ static void drain(struct ao *ao)
if (ao->driver->drain) {
ao->driver->drain(ao);
} else {
- double time = get_delay(ao);
+ double time = unlocked_get_delay(ao);
mp_sleep_us(MPMIN(time, ao->buffer / (double)ao->samplerate + 1) * 1e6);
}