summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-07-26 20:26:27 +0200
committerwm4 <wm4@nowhere>2014-07-26 20:26:27 +0200
commitac6224498374906fad8ec7b026f7e9442c9224c5 (patch)
tree1e53068e0d768dfc6c83027a30748908c4d1f30b /audio
parentef600041ba1afb84b9caed44f43deb1000651340 (diff)
downloadmpv-ac6224498374906fad8ec7b026f7e9442c9224c5.tar.bz2
mpv-ac6224498374906fad8ec7b026f7e9442c9224c5.tar.xz
audio/out: fix initialization failure with win32
mp_make_wakeup_pipe() always fails on win32. If this call fails on Linux (and e.g. ao_alsa is used), this will probably burn CPU since poll() won't work on the invalid file descriptor, but whatever, the failure case is obscure enough.
Diffstat (limited to 'audio')
-rw-r--r--audio/out/push.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/audio/out/push.c b/audio/out/push.c
index 0fb6cb3e29..c825310e01 100644
--- a/audio/out/push.c
+++ b/audio/out/push.c
@@ -364,8 +364,7 @@ static int init(struct ao *ao)
pthread_mutex_init(&p->lock, NULL);
pthread_cond_init(&p->wakeup, NULL);
pthread_cond_init(&p->wakeup_drain, NULL);
- if (mp_make_wakeup_pipe(p->wakeup_pipe) < 0)
- goto err;
+ mp_make_wakeup_pipe(p->wakeup_pipe);
p->buffer = mp_audio_buffer_create(ao);
mp_audio_buffer_reinit_fmt(p->buffer, ao->format,