qt-gstreamer: QPainterVideoSurface: comment out some of the formats which appear to be broken on meego

[George Kiagiadakis]

Module: qt-gstreamer
Branch: master
Commit: db1c564ab4a187cec848c7e100ddc766565e2139
URL:    http://cgit.freedesktop.org/gstreamer/qt-gstreamer/commit/?id=db1c564ab4a187cec848c7e100ddc766565e2139

Author: Brandon Lewis <brandon.lewis at collabora.co.uk>
Date:   Wed Jan 19 19:49:32 2011 +0000

QPainterVideoSurface: comment out some of the formats which appear to be broken on meego

---

 qpaintervideosurface.cpp |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/qpaintervideosurface.cpp b/qpaintervideosurface.cpp
index 7e926e5..9bfe87c 100644
--- a/qpaintervideosurface.cpp
+++ b/qpaintervideosurface.cpp
@@ -1026,18 +1026,21 @@ QVideoSurfaceGlslPainter::QVideoSurfaceGlslPainter(QGLContext *context)
 {
     qDebug() << "GlslPainter";
     m_imagePixelFormats
+            << QVideoFrame::Format_YUV420P
             << QVideoFrame::Format_RGB32
             << QVideoFrame::Format_BGR32
-            << QVideoFrame::Format_ARGB32
-#ifndef QT_OPENGL_ES
+#if !defined(QT_OPENGL_ES) && !defined(QT_OPENGL_ES_2)
             << QVideoFrame::Format_RGB24
             << QVideoFrame::Format_BGR24
-#endif
+
             << QVideoFrame::Format_RGB565
             << QVideoFrame::Format_YUV444
             << QVideoFrame::Format_AYUV444
             << QVideoFrame::Format_YV12
-            << QVideoFrame::Format_YUV420P;
+#endif
+	    << QVideoFrame::Format_ARGB32;
+
+
     m_glPixelFormats
             << QVideoFrame::Format_RGB32
             << QVideoFrame::Format_ARGB32;