diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-17 03:02:21 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-17 03:02:21 +0100 |
| commit | 4bb439c8af69448a7453f9409a7ff15b1e69b72d (patch) | |
| tree | 50b436863ed1d8b4028f8ddac9d28e08d203d63a /src/plugins/directshow/player | |
| parent | 2bebbc5dd1492c0e26183967ce3432748a56e3cd (diff) | |
| parent | fa5744670ce9c5fdee65a98337e4d6bb5146c981 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Iaf74b2b0f03af46942beaa5aa1fc61296a66ec47
Diffstat (limited to 'src/plugins/directshow/player')
| -rw-r--r-- | src/plugins/directshow/player/directshowiosource.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/directshow/player/directshowplayerservice.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/directshow/player/directshowiosource.cpp b/src/plugins/directshow/player/directshowiosource.cpp index 31e9a1300..d5833fafc 100644 --- a/src/plugins/directshow/player/directshowiosource.cpp +++ b/src/plugins/directshow/player/directshowiosource.cpp @@ -97,8 +97,6 @@ DirectShowIOSource::DirectShowIOSource(DirectShowEventLoop *loop) 0, // pbFormat }; - static const int count = sizeof(directshow_subtypes) / sizeof(GUID); - for (const auto &directshowSubtype : directshow_subtypes) { type.subtype = directshowSubtype; m_supportedMediaTypes.append(DirectShowMediaType(type)); diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp index 8768bd3da..81c9a1be2 100644 --- a/src/plugins/directshow/player/directshowplayerservice.cpp +++ b/src/plugins/directshow/player/directshowplayerservice.cpp @@ -216,7 +216,7 @@ QMediaControl *DirectShowPlayerService::requestControl(const char *name) } } else if (qstrcmp(name, QVideoWindowControl_iid) == 0) { if (!m_videoRendererControl && !m_videoWindowControl) { - IBaseFilter *filter; + IBaseFilter *filter{}; #if QT_CONFIG(evr) if (!qgetenv("QT_DIRECTSHOW_NO_EVR").toInt()) { |