diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-07-23 11:05:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-07-23 11:05:11 +0200 |
| commit | 32e49d634c5892ed98074cb3dd76a323357dfe54 (patch) | |
| tree | 252495f053b0084da47894ce1daee460abe40718 /src/plugins/directshow/common/directshowmediatypeenum.cpp | |
| parent | 5825dd2773755cea236d9816cc7541bc20f9cb80 (diff) | |
| parent | d9dd7f4896cbc0fe1dc37e517c28315419e6ffcd (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/plugins/directshow/player/directshowplayerservice.cpp
Change-Id: I482098bb3c3b5b291175ca798b0d6ba61ad87d86
Diffstat (limited to 'src/plugins/directshow/common/directshowmediatypeenum.cpp')
| -rw-r--r-- | src/plugins/directshow/common/directshowmediatypeenum.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/directshow/common/directshowmediatypeenum.cpp b/src/plugins/directshow/common/directshowmediatypeenum.cpp index 10623a246..56716ed75 100644 --- a/src/plugins/directshow/common/directshowmediatypeenum.cpp +++ b/src/plugins/directshow/common/directshowmediatypeenum.cpp @@ -50,7 +50,7 @@ DirectShowMediaTypeEnum::DirectShowMediaTypeEnum(DirectShowPin *pin) } DirectShowMediaTypeEnum::DirectShowMediaTypeEnum(const QList<DirectShowMediaType> &types) - : m_pin(NULL) + : m_pin(nullptr) , m_mediaTypes(types) , m_index(0) { |