diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
| commit | 35aa705c3ece8293652ffcf449c71fe80b96e722 (patch) | |
| tree | 7c0fb34ec96204cbcd867a973b2476689919a5b4 /audio/out/push.c | |
| parent | 10a005df0c981050afc35184a42173bea7ea2527 (diff) | |
| parent | 3739d1318fdb658bb6037bfe06bb6cefb3b50a09 (diff) | |
| download | mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.bz2 mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'audio/out/push.c')
| -rw-r--r-- | audio/out/push.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/audio/out/push.c b/audio/out/push.c index a4a6808d7f..a722d19ea2 100644 --- a/audio/out/push.c +++ b/audio/out/push.c @@ -251,12 +251,11 @@ static int play(struct ao *ao, void **data, int samples, int flags) if (got_data) { p->still_playing = true; p->expected_end_time = 0; - } - // If we don't have new data, the decoder thread basically promises it - // will send new data as soon as it's available. - if (got_data) + // If we don't have new data, the decoder thread basically promises it + // will send new data as soon as it's available. wakeup_playthread(ao); + } pthread_mutex_unlock(&p->lock); return write_samples; } |