From 0ac95e3243268eeae4fda4afea0fc7185ace5b3f Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Mon, 27 Jul 2015 20:03:05 +1000 Subject: [PATCH] gl/cocoa: fix definition of gst_gl_context_new gstglcontext_cocoa.m:75:1: error: conflicting types for 'gst_gl_context_cocoa_new' --- gst-libs/gst/gl/cocoa/gstglcontext_cocoa.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.h b/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.h index 6b79bc404c..22069ee6bb 100644 --- a/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.h +++ b/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.h @@ -60,7 +60,7 @@ struct _GstGLContextCocoaClass { GType gst_gl_context_cocoa_get_type (void); -GstGLContextCocoa * gst_gl_context_cocoa_new (void); +GstGLContextCocoa * gst_gl_context_cocoa_new (GstGLDisplay * display); guintptr gst_gl_context_cocoa_get_current_context (void); CGLPixelFormatObj gst_gl_context_cocoa_get_pixel_format (GstGLContextCocoa *context); void gst_gl_context_cocoa_dump_pixel_format (CGLPixelFormatObj fmt);