--- a/qtmobility/src/multimedia/qpaintervideosurface_p.h	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/src/multimedia/qpaintervideosurface_p.h	Wed Jun 23 19:08:38 2010 +0300
@@ -58,8 +58,8 @@
 #include <QtGui/qimage.h>
 #include <QtGui/qmatrix4x4.h>
 #include <QtGui/qpaintengine.h>
-#include <QtMultimedia/qabstractvideosurface.h>
-#include <QtMultimedia/qvideoframe.h>
+#include <qabstractvideosurface.h>
+#include <qvideoframe.h>
 
 QT_BEGIN_NAMESPACE
 class QGLContext;
@@ -69,7 +69,29 @@
 
 QT_BEGIN_NAMESPACE
 
-class QVideoSurfacePainter;
+class QVideoSurfacePainter
+{
+public:
+    virtual ~QVideoSurfacePainter();
+
+    virtual QList<QVideoFrame::PixelFormat> supportedPixelFormats(
+            QAbstractVideoBuffer::HandleType handleType) const = 0;
+
+    virtual bool isFormatSupported(
+            const QVideoSurfaceFormat &format, QVideoSurfaceFormat *similar) const = 0;
+
+    virtual QAbstractVideoSurface::Error start(const QVideoSurfaceFormat &format) = 0;
+    virtual void stop() = 0;
+
+    virtual QAbstractVideoSurface::Error setCurrentFrame(const QVideoFrame &frame) = 0;
+
+    virtual QAbstractVideoSurface::Error paint(
+            const QRectF &target, QPainter *painter, const QRectF &source) = 0;
+
+    virtual void updateColors(int brightness, int contrast, int hue, int saturation) = 0;
+};
+
+
 class Q_AUTOTEST_EXPORT QPainterVideoSurface : public QAbstractVideoSurface
 {
     Q_OBJECT