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/common/directshowpin.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/common/directshowpin.h')
-rw-r--r-- | src/plugins/directshow/common/directshowpin.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/directshow/common/directshowpin.h b/src/plugins/directshow/common/directshowpin.h index 5e513d002..bb5a07ad7 100644 --- a/src/plugins/directshow/common/directshowpin.h +++ b/src/plugins/directshow/common/directshowpin.h @@ -56,7 +56,7 @@ public: virtual ~DirectShowPin(); QString name() const { return m_name; } - bool isConnected() const { return m_peerPin != NULL; } + bool isConnected() const { return m_peerPin != nullptr; } virtual bool isMediaTypeSupported(const AM_MEDIA_TYPE *type) = 0; virtual QList<DirectShowMediaType> supportedMediaTypes(); @@ -102,7 +102,7 @@ protected: QString m_name; PIN_DIRECTION m_direction; - IPin *m_peerPin; + IPin *m_peerPin = nullptr; DirectShowMediaType m_mediaType; private: @@ -128,8 +128,8 @@ public: protected: DirectShowOutputPin(DirectShowBaseFilter *filter, const QString &name); - IMemAllocator *m_allocator; - IMemInputPin *m_inputPin; + IMemAllocator *m_allocator = nullptr; + IMemInputPin *m_inputPin = nullptr; private: Q_DISABLE_COPY(DirectShowOutputPin) @@ -166,9 +166,9 @@ public: protected: DirectShowInputPin(DirectShowBaseFilter *filter, const QString &name); - IMemAllocator *m_allocator; - bool m_flushing; - bool m_inErrorState; + IMemAllocator *m_allocator = nullptr; + bool m_flushing = false; + bool m_inErrorState = false; AM_SAMPLE2_PROPERTIES m_sampleProperties; private: |