From: Peter Seiderer <ps.report@gmx.net>
Date: Wed, 28 Jan 2015 19:25:35 +0000 (+0100)
Subject: Fix no-opengl pixel format check (reenables Format_RGB24)
X-Git-Tag: v5.5.90+alpha1~32^2^2~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ea222e64b1c98fa767a6a683d66a85026ab30ff2;p=platform%2Fupstream%2Fqtmultimedia.git

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>
---

diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp
index 2ab5dcb..13306fd 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) {