Merge branch 'master' into osd_changes

Conflicts:
	Makefile
	command.c
	libvo/gl_common.c
	libvo/vo_corevideo.m
	libvo/vo_opengl.c
	libvo/vo_opengl_old.c
	libvo/vo_opengl_shaders.glsl
	sub/ass_mp.c
	sub/osd_libass.c
	sub/sd_ass.c

1 files changed, 4 insertions, 5 deletions

diff --git a/libvo/vo_corevideo.m b/libvo/vo_corevideo.m
index e5c74f6cc8..6775762787 100644
--- a/libvo/vo_corevideo.m
+++ b/libvo/vo_corevideo.m
@@ -146,9 +146,8 @@ static int config(struct vo *vo, uint32_t width, uint32_t height,
     p->image_width = width;
     p->image_height = height;
 
-    if (p->mpglctx->create_window(p->mpglctx, d_width, d_height, flags) < 0)
-        return -1;
-    if (p->mpglctx->setGlWindow(p->mpglctx) == SET_WINDOW_FAILED)
+    int mpgl_caps = MPGL_CAP_GL_LEGACY;
+    if (!mpgl_create_window(p->mpglctx, mpgl_caps, d_width, d_height, flags))
         return -1;
 
     init_gl(vo, vo->dwidth, vo->dheight);
@@ -277,7 +276,7 @@ static void uninit(struct vo *vo)
     struct priv *p = vo->priv;
     if (p->osd)
         mpgl_osd_destroy(p->osd);
-    uninit_mpglcontext(p->mpglctx);
+    mpgl_uninit(p->mpglctx);
     release_cv_entities(vo);
 }
 
@@ -287,7 +286,7 @@ static int preinit(struct vo *vo, const char *arg)
     struct priv *p = vo->priv;
 
     *p = (struct priv) {
-        .mpglctx = init_mpglcontext(GLTYPE_COCOA, vo),
+        .mpglctx = mpgl_init(GLTYPE_COCOA, vo),
         .colorspace = MP_CSP_DETAILS_DEFAULTS,
         .quad = talloc_ptrtype(p, p->quad),
     };