diff options
| author | Jan Schmidt <jan@centricular.com> | 2017-11-23 22:58:40 +1100 |
|---|---|---|
| committer | Jan Schmidt <jan@centricular.com> | 2017-11-24 01:48:27 +1100 |
| commit | 4359684dd204af2ea98998ec2993851af30eefbe (patch) | |
| tree | 2fcebdb5a25db075cc6773db597ad03f9ded4781 /ext | |
| parent | e16ad13ed6f3aabc7fbca1bbcd30663cacb0bf94 (diff) | |
Revert "gl: Use GstGLDisplayEGL directly instead of creating a GstGLDisplayVIVFb subclass"
This reverts commit 47fd4d391e775c11f529705bb0f457a9d25ba5e7.
This patch is incorrect. It doesn't actually compile, and causes a crash
because the viv-fb window implementation needs a native EGL handle
to pass to fbCreateWindow, but the GstGLDisplayEGL handleis actually
an EGLDisplay now (and gets cast to the wrong type)
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/qt/gstqtglutility.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/qt/gstqtglutility.cc b/ext/qt/gstqtglutility.cc index 84794e4ee..ff8d87592 100644 --- a/ext/qt/gstqtglutility.cc +++ b/ext/qt/gstqtglutility.cc @@ -169,7 +169,11 @@ gst_qt_get_gl_wrapcontext (GstGLDisplay * display, } #endif #if GST_GL_HAVE_PLATFORM_EGL && defined (HAVE_QT_EGLFS) +#if GST_GL_HAVE_WINDOW_VIV_FB + if (GST_IS_GL_DISPLAY_VIV_FB (display)) { +#else if (GST_IS_GL_DISPLAY_EGL (display)) { +#endif platform = GST_GL_PLATFORM_EGL; } #endif |