diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-26 19:59:33 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-26 19:59:33 (GMT) |
| commit | a88e0c0d39ad524061a1f4079e992b8edda80a3e (patch) | |
| tree | f66f7fd39373049fe89fecf8134f72a1988d8dac /src/plugins/mediaservices/gstreamer/qgstreamervideooverlay.cpp | |
| parent | ca82ee4ee55e52c75326949148455af1095df014 (diff) | |
| parent | 2e08308e49ea287a6dcb4ec257698281ac8ff0a8 (diff) | |
| download | Qt-a88e0c0d39ad524061a1f4079e992b8edda80a3e.zip Qt-a88e0c0d39ad524061a1f4079e992b8edda80a3e.tar.gz Qt-a88e0c0d39ad524061a1f4079e992b8edda80a3e.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Rebuild configure.exe
Make the Direct Show media service compile with a Qt namespace.
Make the Direct Show media service compile with mingw.
QT7; Fix warnings.
Qt namespace fixes.
Fixed QTMoview object leak.
QMediaContent: Add a convenience method to retrieve the QNetworkRequest.
Use the monitor color space for video output.
Test for the existance of the Windows Media SDK in configure.
Try to start media playback on all load state changes.
Remove all uses of __uuidof from the Direct Show media service.
QT7; Add support for setting cookies when loading a movie.
Diffstat (limited to 'src/plugins/mediaservices/gstreamer/qgstreamervideooverlay.cpp')
| -rw-r--r-- | src/plugins/mediaservices/gstreamer/qgstreamervideooverlay.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/mediaservices/gstreamer/qgstreamervideooverlay.cpp b/src/plugins/mediaservices/gstreamer/qgstreamervideooverlay.cpp index 6c6c802..846a24a 100644 --- a/src/plugins/mediaservices/gstreamer/qgstreamervideooverlay.cpp +++ b/src/plugins/mediaservices/gstreamer/qgstreamervideooverlay.cpp @@ -46,6 +46,8 @@ #include "qx11videosurface.h" +QT_BEGIN_NAMESPACE + QGstreamerVideoOverlay::QGstreamerVideoOverlay(QObject *parent) : QVideoWindowControl(parent) , m_surface(new QX11VideoSurface) @@ -208,3 +210,6 @@ void QGstreamerVideoOverlay::setScaledDisplayRect() break; }; } + +QT_END_NAMESPACE + |