diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-10-19 19:09:00 +0200 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-10-19 19:09:00 +0200 |
| commit | 5d74fa7dc0fa1617d1d11b69769423b1387ec785 (patch) | |
| tree | 882752015b3500c91b8ab3a4d669696f23feb817 /misc/dispatch.h | |
| parent | c226bc7616ab2ae9de6172660e9cf727f07dc374 (diff) | |
| parent | a2fa0d0b68ce200598122145254f56ae1adff91e (diff) | |
| download | mpv-5d74fa7dc0fa1617d1d11b69769423b1387ec785.tar.bz2 mpv-5d74fa7dc0fa1617d1d11b69769423b1387ec785.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'misc/dispatch.h')
| -rw-r--r-- | misc/dispatch.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/misc/dispatch.h b/misc/dispatch.h index 96a5d7cf4b..a762e47cd2 100644 --- a/misc/dispatch.h +++ b/misc/dispatch.h @@ -15,8 +15,7 @@ void mp_dispatch_enqueue_autofree(struct mp_dispatch_queue *queue, void mp_dispatch_run(struct mp_dispatch_queue *queue, mp_dispatch_fn fn, void *fn_data); void mp_dispatch_queue_process(struct mp_dispatch_queue *queue, double timeout); -void mp_dispatch_suspend(struct mp_dispatch_queue *queue); -void mp_dispatch_resume(struct mp_dispatch_queue *queue); +void mp_dispatch_interrupt(struct mp_dispatch_queue *queue); void mp_dispatch_lock(struct mp_dispatch_queue *queue); void mp_dispatch_unlock(struct mp_dispatch_queue *queue); |