Merge branch 'dev' of git://code.qt.io/qt/qtmultimedia into wip/qt6

Change-Id: I91e8d902cd916ee16a2495da9bf40a34c6bc05d2

1 files changed, 4 insertions, 9 deletions

diff --git a/src/plugins/directshow/player/directshowvideorenderercontrol.cpp b/src/plugins/directshow/player/directshowvideorenderercontrol.cpp
index 88b5a51eb..19be82141 100644
--- a/src/plugins/directshow/player/directshowvideorenderercontrol.cpp
+++ b/src/plugins/directshow/player/directshowvideorenderercontrol.cpp
@@ -51,11 +51,6 @@
 DirectShowVideoRendererControl::DirectShowVideoRendererControl(DirectShowEventLoop *loop, QObject *parent)
     : QVideoRendererControl(parent)
     , m_loop(loop)
-    , m_surface(0)
-    , m_filter(0)
-#if QT_CONFIG(evr)
-    , m_evrPresenter(0)
-#endif
 {
 }
 
@@ -85,13 +80,13 @@ void DirectShowVideoRendererControl::setSurface(QAbstractVideoSurface *surface)
     if (m_evrPresenter) {
         m_evrPresenter->setSurface(nullptr);
         m_evrPresenter->Release();
-        m_evrPresenter = 0;
+        m_evrPresenter = nullptr;
     }
 #endif
 
     if (m_filter) {
         m_filter->Release();
-        m_filter = 0;
+        m_filter = nullptr;
     }
 
     m_surface = surface;
@@ -103,9 +98,9 @@ void DirectShowVideoRendererControl::setSurface(QAbstractVideoSurface *surface)
             m_evrPresenter = new EVRCustomPresenter(m_surface);
             if (!m_evrPresenter->isValid() || !qt_evr_setCustomPresenter(m_filter, m_evrPresenter)) {
                 m_filter->Release();
-                m_filter = 0;
+                m_filter = nullptr;
                 m_evrPresenter->Release();
-                m_evrPresenter = 0;
+                m_evrPresenter = nullptr;
             }
         }