diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-02-19 10:04:30 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-02-19 10:05:11 +0100 |
| commit | 13882cd5da72bf0f6657752344793103a43a8e41 (patch) | |
| tree | 6a3323763df5e42fc5d25a84786efff1f41c256e /src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h | |
| parent | 391e8a7147edb1cdff6f1362ae0d3be4e7271ea7 (diff) | |
| parent | 01714ef0c5ee80544e3799ae2a66d9a611c9d71f (diff) | |
Merge remote-tracking branch 'origin/dev' into stable
Change-Id: I84b36fa41f3d5f8fea2dec2545f72ebe6a0c7908
Diffstat (limited to 'src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h')
| -rw-r--r-- | src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h b/src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h index 42ce913ec..f09bdbd1f 100644 --- a/src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h +++ b/src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h @@ -57,7 +57,7 @@ class QGstreamerVideoRenderer : public QVideoRendererControl, public QGstreamerV public: QGstreamerVideoRenderer(QObject *parent = 0); virtual ~QGstreamerVideoRenderer(); - + QAbstractVideoSurface *surface() const; void setSurface(QAbstractVideoSurface *surface); @@ -73,7 +73,7 @@ signals: private slots: void handleFormatChange(); -private: +private: QVideoSurfaceGstSink *m_videoSink; QPointer<QAbstractVideoSurface> m_surface; }; |