summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-06-12 00:30:21 +0200
committerwm4 <wm4@nowhere>2014-06-12 00:55:13 +0200
commitd07cd11b14ab9b91f73a31787bced50660bdd0a8 (patch)
tree2bf461f7439747166ca9a1a75e26ab790e26a70b /audio
parent231c6672140f019257edd26db20fbcfc2554258f (diff)
downloadmpv-d07cd11b14ab9b91f73a31787bced50660bdd0a8.tar.bz2
mpv-d07cd11b14ab9b91f73a31787bced50660bdd0a8.tar.xz
audio: don't wait when draining and paused
A corner case that could possibly lead to infinite waiting. Though I'm not aware that this actually happened in practice.
Diffstat (limited to 'audio')
-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 e98d3e6abb..9b2355a0c2 100644
--- a/audio/out/push.c
+++ b/audio/out/push.c
@@ -295,7 +295,7 @@ static void *playthread(void *arg)
p->requested_data = true;
}
- if (p->drain && p->avoid_ao_wait) {
+ if (p->drain && (p->avoid_ao_wait || p->paused)) {
if (ao->driver->drain)
ao->driver->drain(ao);
p->drain = false;