diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2015-11-10 18:45:08 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2015-11-10 18:45:08 +0100 |
| commit | 273607c1c6f77859e9a0cb98c3e4c74bc354fd8d (patch) | |
| tree | 0fbd329857356bddf1d4dfbcf09ca4fbe2d6f0f9 /video/out/w32_common.h | |
| parent | 5b7d0fbab31cb70d05bb7f757283c1ee4028b091 (diff) | |
| parent | fee45c01703ace0d6af7b8fe60d151be245a0e3f (diff) | |
| download | mpv-273607c1c6f77859e9a0cb98c3e4c74bc354fd8d.tar.bz2 mpv-273607c1c6f77859e9a0cb98c3e4c74bc354fd8d.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'video/out/w32_common.h')
| -rw-r--r-- | video/out/w32_common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/w32_common.h b/video/out/w32_common.h index 094660a34f..88cc664bf2 100644 --- a/video/out/w32_common.h +++ b/video/out/w32_common.h @@ -29,7 +29,7 @@ struct vo; int vo_w32_init(struct vo *vo); void vo_w32_uninit(struct vo *vo); int vo_w32_control(struct vo *vo, int *events, int request, void *arg); -int vo_w32_config(struct vo *vo); +void vo_w32_config(struct vo *vo); HWND vo_w32_hwnd(struct vo *vo); void vo_w32_run_on_thread(struct vo *vo, void (*cb)(void *ctx), void *ctx); |