--- a/qtmobility/plugins/multimedia/gstreamer/qgstreamervideooverlay.cpp	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreamervideooverlay.cpp	Wed Jun 23 19:08:38 2010 +0300
@@ -42,10 +42,12 @@
 #include "qgstreamervideooverlay.h"
 #include "qvideosurfacegstsink.h"
 
-#include <QtMultimedia/qvideosurfaceformat.h>
+#include <qvideosurfaceformat.h>
 
 #include "qx11videosurface.h"
 
+#ifndef QT_NO_XVIDEO
+
 QGstreamerVideoOverlay::QGstreamerVideoOverlay(QObject *parent)
     : QVideoWindowControl(parent)
     , m_surface(new QX11VideoSurface)
@@ -195,7 +197,7 @@
     switch (m_aspectRatioMode) {
     case Qt::KeepAspectRatio:
         {
-            QSize size = formatViewport.size();
+            QSize size = m_surface->surfaceFormat().sizeHint();
             size.scale(m_displayRect.size(), Qt::KeepAspectRatio);
 
             QRect rect(QPoint(0, 0), size);
@@ -212,14 +214,15 @@
     case Qt::KeepAspectRatioByExpanding:
         {
             QSize size = m_displayRect.size();
-            size.scale(formatViewport.size(), Qt::KeepAspectRatio);
+            size.scale(m_surface->surfaceFormat().sizeHint(), Qt::KeepAspectRatio);
 
             QRect viewport(QPoint(0, 0), size);
             viewport.moveCenter(formatViewport.center());
-
             m_surface->setDisplayRect(m_displayRect);
             m_surface->setViewport(viewport);
         }
         break;
     };
 }
+
+#endif //QT_NO_XVIDEO