summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosep Torra <jtorra@oblong.com>2017-12-12 08:31:47 +0100
committerJosep Torra <jtorra@oblong.com>2017-12-12 08:31:47 +0100
commit842d7a91621b483df42b48d7645394fed0854837 (patch)
tree4ed50148980e0fa3440f0ba6fba3b0c2859ff6c1
parentc0d87b5dd3565cc9bd086e36ffa323d7131052a4 (diff)
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 *')
-rw-r--r--gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m4
1 files 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 4b2eb605d..4533b83c9 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];