diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-29 14:19:29 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-29 14:19:29 +0200 |
| commit | cb324a50c920b275ef6c04162712b1a6f19bbe8d (patch) | |
| tree | bf2e6f0565599154ad39996bf9f69515a584b1aa /src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h | |
| parent | f23a7f9da4958527a7fe762f82fa7fc28e8f0adf (diff) | |
| parent | 20fa4834478ec211c3d4fbcd4066f01cc2024285 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I0f0457e9863f540b7bd8bc104c92891d8cf5c483
Diffstat (limited to 'src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h')
| -rw-r--r-- | src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h b/src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h index b7121e0b5..42ce913ec 100644 --- a/src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h +++ b/src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h @@ -44,6 +44,7 @@ #include <qvideorenderercontrol.h> #include <private/qvideosurfacegstsink_p.h> +#include <qabstractvideosurface.h> #include "qgstreamervideorendererinterface_p.h" @@ -74,7 +75,7 @@ private slots: private: QVideoSurfaceGstSink *m_videoSink; - QAbstractVideoSurface *m_surface; + QPointer<QAbstractVideoSurface> m_surface; }; QT_END_NAMESPACE |