diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/videonode/egl/qsgvideonode_egl.h | 3 | ||||
| -rw-r--r-- | src/plugins/videonode/imx6/qsgvivantevideonodefactory.cpp | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/videonode/egl/qsgvideonode_egl.h b/src/plugins/videonode/egl/qsgvideonode_egl.h index 0ec63eac1..f83231e53 100644 --- a/src/plugins/videonode/egl/qsgvideonode_egl.h +++ b/src/plugins/videonode/egl/qsgvideonode_egl.h @@ -51,6 +51,9 @@ #ifdef Bool # undef Bool #endif +#ifdef None +# undef None +#endif QT_BEGIN_NAMESPACE diff --git a/src/plugins/videonode/imx6/qsgvivantevideonodefactory.cpp b/src/plugins/videonode/imx6/qsgvivantevideonodefactory.cpp index e1c8d803a..55ed57c10 100644 --- a/src/plugins/videonode/imx6/qsgvivantevideonodefactory.cpp +++ b/src/plugins/videonode/imx6/qsgvivantevideonodefactory.cpp @@ -39,11 +39,13 @@ #include "qsgvivantevideonodefactory.h" #include "qsgvivantevideonode.h" +#include <QtGui/QGuiApplication> QList<QVideoFrame::PixelFormat> QSGVivanteVideoNodeFactory::supportedPixelFormats( QAbstractVideoBuffer::HandleType handleType) const { - if (handleType == QAbstractVideoBuffer::NoHandle) + const bool isWebGl = QGuiApplication::platformName() == QLatin1String("webgl"); + if (!isWebGl && handleType == QAbstractVideoBuffer::NoHandle) return QSGVivanteVideoNode::getVideoFormat2GLFormatMap().keys(); else return QList<QVideoFrame::PixelFormat>(); |