diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-14 03:01:32 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-14 03:01:32 +0100 |
| commit | 50e8e0f89da51a64bed5d25b507752e49c46c324 (patch) | |
| tree | eacc4076fdda54a0d079774113dd7842f6fe1af4 /src | |
| parent | 126d16b0f81f5fae2de5469d9f233d9b79d08d61 (diff) | |
| parent | c4ee7b6525234284dc593f9304c72ef9d474a168 (diff) | |
| download | qtmultimedia-50e8e0f89da51a64bed5d25b507752e49c46c324.tar.gz | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ie912379a82447106f7708d09992425da3734e825
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>(); |