diff options
| author | Simon Himmelbauer <shimmelbauer@toolsonair.com> | 2017-05-18 15:23:14 +0300 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2017-05-29 11:07:00 +0300 |
| commit | a73560b92f17ded1731d3245846615ae2663b5ee (patch) | |
| tree | 3154b46c42bcd9fc4687b994896aa7a6e8724baa | |
| parent | 3ca00bd2bd2d36f33a1485ece08a4e4ac0a68027 (diff) | |
| download | gstreamer-plugins-bad-a73560b92f17ded1731d3245846615ae2663b5ee.tar.gz | |
qt: Use GST_GL_HAVE_PLATFORM_CGL instead of GST_GL_HAVE_PLATFORM_COCOA
The latter is not used/available anymore since years. Also fix a typo
in the include path for the Cocoa GL display header.
| -rw-r--r-- | ext/qt/gstqtglutility.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/qt/gstqtglutility.cc b/ext/qt/gstqtglutility.cc index 4d6d31864..986564ee1 100644 --- a/ext/qt/gstqtglutility.cc +++ b/ext/qt/gstqtglutility.cc @@ -41,8 +41,8 @@ #include <gst/gl/egl/gstglcontext_egl.h> #endif -#if GST_GL_HAVE_WINDOW_COCOA && GST_GL_HAVE_PLATFORM_COCOA && defined (HAVE_QT_MAC) -#include <gst/gl/coaoa/gstgldisplay_cocoa.h> +#if GST_GL_HAVE_WINDOW_COCOA && GST_GL_HAVE_PLATFORM_CGL && defined (HAVE_QT_MAC) +#include <gst/gl/cocoa/gstgldisplay_cocoa.h> #endif #define GST_CAT_DEFAULT qt_gl_utils_debug @@ -89,7 +89,7 @@ gst_qt_get_gl_display () display = (GstGLDisplay *) gst_gl_display_egl_new (); #endif -#if GST_GL_HAVE_WINDOW_COCOA && GST_GL_HAVE_PLATFORM_COCOA && defined (HAVE_QT_MAC) +#if GST_GL_HAVE_WINDOW_COCOA && GST_GL_HAVE_PLATFORM_CGL && defined (HAVE_QT_MAC) if (QString::fromUtf8 ("cocoa") == app->platformName()) display = (GstGLDisplay *) gst_gl_display_cocoa_new (); #endif @@ -135,7 +135,7 @@ gst_qt_get_gl_wrapcontext (GstGLDisplay * display, } #endif if (platform == 0) { -#if GST_GL_HAVE_WINDOW_COCOA && GST_GL_HAVE_PLATFORM_COCOA && defined (HAVE_QT_MAC) +#if GST_GL_HAVE_WINDOW_COCOA && GST_GL_HAVE_PLATFORM_CGL && defined (HAVE_QT_MAC) platform = GST_GL_PLATFORM_CGL; #elif GST_GL_HAVE_WINDOW_EAGL && GST_GL_HAVE_PLATFORM_EAGL && defined (HAVE_QT_IOS) platform = GST_GL_PLATFORM_EAGL; |