summaryrefslogtreecommitdiffstats
path: root/libvo/gl_common.c
diff options
context:
space:
mode:
authorwm4 <wm4@mplayer2.org>2012-04-01 22:52:33 +0200
committerwm4 <wm4@mplayer2.org>2012-04-01 22:52:33 +0200
commit1aa2e36122e6e664e42170f47d6db82873bef5aa (patch)
tree39e13f93bcb606da9e365c7cd379132bdf53c20b /libvo/gl_common.c
parentfea8c85c8595b797fc839b113c1db252fc55c798 (diff)
parent8cd71527ade21ea27ea24cdcc66dc71dca460f85 (diff)
downloadmpv-1aa2e36122e6e664e42170f47d6db82873bef5aa.tar.bz2
mpv-1aa2e36122e6e664e42170f47d6db82873bef5aa.tar.xz
Merge remote-tracking branch 'origin/master'
Conflicts: bstr.c bstr.h etc/input.conf input/input.c input/input.h libao2/ao_pulse.c libmpcodecs/vf_ass.c libmpcodecs/vf_vo.c libvo/gl_common.c libvo/x11_common.c mixer.c mixer.h mplayer.c
Diffstat (limited to 'libvo/gl_common.c')
-rw-r--r--libvo/gl_common.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libvo/gl_common.c b/libvo/gl_common.c
index c5abc81e15..414e52dbd2 100644
--- a/libvo/gl_common.c
+++ b/libvo/gl_common.c
@@ -2447,6 +2447,7 @@ MPGLContext *init_mpglcontext(enum MPGLType type, struct vo *vo)
ctx->check_events = cocoa_check_events;
ctx->update_xinerama_info = cocoa_update_xinerama_info;
ctx->fullscreen = cocoa_fullscreen;
+ ctx->ontop = vo_cocoa_ontop;
ctx->vo_uninit = vo_cocoa_uninit;
if (vo_cocoa_init(vo))
return ctx;