summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-10-05 23:05:54 +0200
committerAlessandro Ghedini <alessandro@ghedini.me>2014-10-11 13:59:22 +0200
commit9258d0461ee7391c60f8c36dcb42937719c5d6a8 (patch)
tree240d2a76aa70412417da0e8847589ea1b324ccee
parente2f59fcabd763fa8c0e5386a3782bdb292bafb43 (diff)
downloadmpv-9258d0461ee7391c60f8c36dcb42937719c5d6a8.tar.bz2
mpv-9258d0461ee7391c60f8c36dcb42937719c5d6a8.tar.xz
audio/out/push: fix some AOs freezing on exit
Caused by a dumb deadlock.
-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);
}