summaryrefslogtreecommitdiffstats
path: root/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-11 18:48:35 +0200
committerLiang Qi <liang.qi@qt.io>2019-09-12 08:50:11 +0000
commit324471ef9054911422f8f2d40a243c67b501c8f0 (patch)
treeb6fccceb55f338a8c53e31afb88a4fce965d305b /src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h
parentc9058d90d0b08781f14a494780c3094594c81f22 (diff)
parenta1bf811b1dd287fbb75b6d27dbc163f15001e28f (diff)
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts: src/gsttools/qgstvideorenderersink.cpp src/gsttools/qgstvideorenderersink_p.h Change-Id: I7fe29161d568fa3f7688abfd2f993d1b16ac3fb9
Diffstat (limited to 'src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h')
-rw-r--r--src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h
index ec0c0944b..f88f0ae38 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h
@@ -73,25 +73,25 @@ public:
void releaseControl(QMediaControl *control) override;
private:
- QGstreamerPlayerControl *m_control;
- QGstreamerPlayerSession *m_session;
- QGstreamerMetaDataProvider *m_metaData;
- QGstreamerStreamsControl *m_streamsControl;
- QGStreamerAvailabilityControl *m_availabilityControl;
+ QGstreamerPlayerControl *m_control = nullptr;
+ QGstreamerPlayerSession *m_session = nullptr;
+ QGstreamerMetaDataProvider *m_metaData = nullptr;
+ QGstreamerStreamsControl *m_streamsControl = nullptr;
+ QGStreamerAvailabilityControl *m_availabilityControl = nullptr;
- QGstreamerAudioProbeControl *m_audioProbeControl;
- QGstreamerVideoProbeControl *m_videoProbeControl;
+ QGstreamerAudioProbeControl *m_audioProbeControl = nullptr;
+ QGstreamerVideoProbeControl *m_videoProbeControl = nullptr;
- QMediaControl *m_videoOutput;
- QMediaControl *m_videoRenderer;
- QGstreamerVideoWindow *m_videoWindow;
+ QMediaControl *m_videoOutput = nullptr;
+ QMediaControl *m_videoRenderer = nullptr;
+ QGstreamerVideoWindow *m_videoWindow = nullptr;
#if defined(HAVE_WIDGETS)
- QGstreamerVideoWidgetControl *m_videoWidget;
+ QGstreamerVideoWidgetControl *m_videoWidget = nullptr;
#endif
void increaseVideoRef();
void decreaseVideoRef();
- int m_videoReferenceCount;
+ int m_videoReferenceCount = 0;
};
QT_END_NAMESPACE