From ea222e64b1c98fa767a6a683d66a85026ab30ff2 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 28 Jan 2015 20:25:35 +0100 Subject: 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 Reviewed-by: Laszlo Agocs --- src/multimediawidgets/qpaintervideosurface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/multimediawidgets') 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) { -- cgit v1.2.3