diff options
| author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2012-04-14 15:02:28 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2012-04-26 21:03:10 +0300 |
| commit | d3da92aea4e865b72194ecc76e0eab6e2a1179a3 (patch) | |
| tree | 792420c1ef4bb57fa0b39eb6f3d61e32a7f47159 /libvo/gl_common.c | |
| parent | 86790494d38c4f33f74875e1ab7a9dc1bdae1772 (diff) | |
| download | mpv-d3da92aea4e865b72194ecc76e0eab6e2a1179a3.tar.bz2 mpv-d3da92aea4e865b72194ecc76e0eab6e2a1179a3.tar.xz | |
cocoa_common, gl_common: add OSX specific getProcAddress
Run dlopen on the OpenGL dynamic library instead of on the binary.
This should prevent crashes due to function conflicts when X11/lGL is
linked.
Remove mutual exclusion of the X11 and Cocoa backends.
Diffstat (limited to 'libvo/gl_common.c')
| -rw-r--r-- | libvo/gl_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libvo/gl_common.c b/libvo/gl_common.c index 30ed50e95e..3b723493db 100644 --- a/libvo/gl_common.c +++ b/libvo/gl_common.c @@ -1628,7 +1628,7 @@ static int create_window_cocoa(struct MPGLContext *ctx, uint32_t d_width, static int setGlWindow_cocoa(MPGLContext *ctx) { vo_cocoa_change_attributes(ctx->vo); - getFunctions(ctx->gl, (void *)getdladdr, NULL); + getFunctions(ctx->gl, (void *)vo_cocoa_glgetaddr, NULL); if (!ctx->gl->SwapInterval) ctx->gl->SwapInterval = vo_cocoa_swap_interval; return SET_WINDOW_OK; |