summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-11-30 00:03:14 +0100
committerwm4 <wm4@nowhere>2015-11-30 00:03:14 +0100
commit7f3cf75c5abae1de389ae0cc12cd165248512a7e (patch)
tree6ffa2e55d26fc65f003e995730c836b02b37643f /video
parentece794d90572a853f5d2967117cebd050c30e8a1 (diff)
downloadmpv-7f3cf75c5abae1de389ae0cc12cd165248512a7e.tar.bz2
mpv-7f3cf75c5abae1de389ae0cc12cd165248512a7e.tar.xz
vo_opengl_cb: pass mpv_global to gl_video
I guess gl_video->global was originally meant to be optional, but now it crashes in some newer code with vo_opengl_cb, which tries to init it with this field set to NULL (because normally it's not needed). Probably fixes #2542.
Diffstat (limited to 'video')
-rw-r--r--video/out/vo_opengl_cb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/vo_opengl_cb.c b/video/out/vo_opengl_cb.c
index b90031d922..37708c0532 100644
--- a/video/out/vo_opengl_cb.c
+++ b/video/out/vo_opengl_cb.c
@@ -176,7 +176,7 @@ int mpv_opengl_cb_init_gl(struct mpv_opengl_cb_context *ctx, const char *exts,
mpgl_load_functions2(ctx->gl, get_proc_address, get_proc_address_ctx,
exts, ctx->log);
- ctx->renderer = gl_video_init(ctx->gl, ctx->log, NULL);
+ ctx->renderer = gl_video_init(ctx->gl, ctx->log, ctx->global);
if (!ctx->renderer)
return MPV_ERROR_UNSUPPORTED;