diff options
| author | Peter Seiderer <ps.report@gmx.net> | 2015-01-28 20:25:35 +0100 |
|---|---|---|
| committer | Tony Sarajärvi <tony.sarajarvi@digia.com> | 2015-02-02 10:19:44 +0000 |
| commit | ea222e64b1c98fa767a6a683d66a85026ab30ff2 (patch) | |
| tree | 793b0e44dc74d4b05ffc2debb7cae4ae8aef5ad1 | |
| parent | 4ab105b89e13c746b08fb807e2104bfca05e88f1 (diff) | |
| download | qtmultimedia-ea222e64b1c98fa767a6a683d66a85026ab30ff2.tar.gz | |
Fix no-opengl pixel format check (reenables Format_RGB24)
Disable Format_RGB24 only in case of QOpenGLContext::LibGLES by
moving the no-opengl endif after the check against Format_RGB24.
Change-Id: I389ae2bb32dc8b2c55ec801f52d820620630b1c0
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| -rw-r--r-- | src/multimediawidgets/qpaintervideosurface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp index 2ab5dcbf5..13306fd87 100644 --- a/src/multimediawidgets/qpaintervideosurface.cpp +++ b/src/multimediawidgets/qpaintervideosurface.cpp @@ -141,8 +141,8 @@ QAbstractVideoSurface::Error QVideoSurfaceGenericPainter::start(const QVideoSurf bool ok = m_imageFormat != QImage::Format_Invalid && !m_imageSize.isEmpty(); #ifndef QT_NO_OPENGL if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES) -#endif ok &= format.pixelFormat() != QVideoFrame::Format_RGB24; +#endif if (ok) return QAbstractVideoSurface::NoError; } else if (t == QAbstractVideoBuffer::QPixmapHandle) { |