diff options
author | wm4 <wm4@nowhere> | 2015-05-06 21:08:26 +0200 |
---|---|---|
committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-05-07 10:53:55 +0900 |
commit | d7cfe38f06cbed6040c8862fc040fa5ac641b7de (patch) | |
tree | 5a2a53add6558b5aa2785a1ba5894c866def65b3 | |
parent | 283a300aa902e9e6962420bfd2a8d37f73b33429 (diff) | |
download | mpv-d7cfe38f06cbed6040c8862fc040fa5ac641b7de.tar.bz2 mpv-d7cfe38f06cbed6040c8862fc040fa5ac641b7de.tar.xz |
cocoa: remove an unused parameter
(cherry picked from commit f58d3591d9c192c9d68a76a0a4ffddd7516c0ef2)
-rw-r--r-- | video/out/cocoa_common.h | 2 | ||||
-rw-r--r-- | video/out/cocoa_common.m | 2 | ||||
-rw-r--r-- | video/out/gl_cocoa.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/video/out/cocoa_common.h b/video/out/cocoa_common.h index e2bed88d08..5b440384fe 100644 --- a/video/out/cocoa_common.h +++ b/video/out/cocoa_common.h @@ -27,7 +27,7 @@ struct vo_cocoa_state; int vo_cocoa_init(struct vo *vo); void vo_cocoa_uninit(struct vo *vo); -int vo_cocoa_config_window(struct vo *vo, uint32_t flags, void *gl_ctx); +int vo_cocoa_config_window(struct vo *vo, uint32_t flags); void vo_cocoa_set_current_context(struct vo *vo, bool current); bool vo_cocoa_start_frame(struct vo *vo); diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m index f9508d6719..a9600dd518 100644 --- a/video/out/cocoa_common.m +++ b/video/out/cocoa_common.m @@ -550,7 +550,7 @@ void vo_cocoa_release_nsgl_ctx(struct vo *vo) s->gl_ctx = nil; } -int vo_cocoa_config_window(struct vo *vo, uint32_t flags, void *gl_ctx) +int vo_cocoa_config_window(struct vo *vo, uint32_t flags) { struct vo_cocoa_state *s = vo->cocoa; with_cocoa_lock_on_main_thread(vo, ^{ diff --git a/video/out/gl_cocoa.c b/video/out/gl_cocoa.c index 014bf38204..1ff9c668ed 100644 --- a/video/out/gl_cocoa.c +++ b/video/out/gl_cocoa.c @@ -141,7 +141,7 @@ static bool config_window_cocoa(struct MPGLContext *ctx, int flags) if (!ctx->gl->SwapInterval) ctx->gl->SwapInterval = set_swap_interval; - vo_cocoa_config_window(ctx->vo, flags, p->ctx); + vo_cocoa_config_window(ctx->vo, flags); return true; } |