diff options
| author | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-07-23 10:33:51 +0200 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-07-23 10:33:51 +0200 |
| commit | 14d6166b2790b37906fd76248d955659ff78622f (patch) | |
| tree | f02ec37165b5ae47beb238aa23031e6e2106502f /src/plugins/directshow/camera/dsvideorenderer.h | |
| parent | e99a2e1701179d0d28ef1d1eac696d480894f4bb (diff) | |
| parent | 2eb0a98f1de07782004a5a4261cb5d2c46ca6d15 (diff) | |
Merge branch 'dev' of git://code.qt.io/qt/qtmultimedia into wip/qt6
Change-Id: I91e8d902cd916ee16a2495da9bf40a34c6bc05d2
Diffstat (limited to 'src/plugins/directshow/camera/dsvideorenderer.h')
| -rw-r--r-- | src/plugins/directshow/camera/dsvideorenderer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/directshow/camera/dsvideorenderer.h b/src/plugins/directshow/camera/dsvideorenderer.h index 3a4570b4c..a6a1f8103 100644 --- a/src/plugins/directshow/camera/dsvideorenderer.h +++ b/src/plugins/directshow/camera/dsvideorenderer.h @@ -50,7 +50,7 @@ class DSVideoRendererControl : public QVideoRendererControl { Q_OBJECT public: - DSVideoRendererControl(DSCameraSession* session, QObject *parent = 0); + DSVideoRendererControl(DSCameraSession* session, QObject *parent = nullptr); ~DSVideoRendererControl() override; QAbstractVideoSurface *surface() const override; @@ -59,7 +59,7 @@ public: void setSession(DSCameraSession* session); private: - QAbstractVideoSurface* m_surface; + QAbstractVideoSurface* m_surface = nullptr; DSCameraSession* m_session; }; |