From 70f93db1812d106f1ed406a63ef8a6429c32e87a Mon Sep 17 00:00:00 2001 From: Josep Torra Date: Tue, 12 Dec 2017 08:31:47 +0100 Subject: [PATCH] gl: cocoa: fix a warning when building in MacOS 10.12 gstglwindow_cocoa.m:186:60: error: incompatible pointer types sending 'GstGLContextCocoa *' (aka 'struct _GstGLContextCocoa *') to parameter of type 'GstGLContext *' (aka 'struct _GstGLContext *') --- gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m b/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m index 4b2eb605d9..4533b83c9b 100644 --- a/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m +++ b/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m @@ -183,12 +183,12 @@ gst_gl_window_cocoa_create_window (GstGLWindowCocoa *window_cocoa) return FALSE; context_cocoa = GST_GL_CONTEXT_COCOA (context); - layer = [[GstGLCAOpenGLLayer alloc] initWithGstGLContext:context_cocoa]; + layer = [[GstGLCAOpenGLLayer alloc] initWithGstGLContext:context]; glView = [[GstGLNSView alloc] initWithFrameLayer:window_cocoa rect:windowRect layer:layer]; gst_object_unref (context); - internal_win_id = [[GstGLNSWindow alloc] initWithContentRect:rect styleMask: + internal_win_id = [[GstGLNSWindow alloc] initWithContentRect:rect styleMask: (NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskResizable | NSWindowStyleMaskMiniaturizable) backing: NSBackingStoreBuffered defer: NO screen: nil gstWin: window_cocoa];