Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"

1 files changed, 2 insertions, 2 deletions

diff --git a/src/plugins/directshow/player/directshowevrvideowindowcontrol.cpp b/src/plugins/directshow/player/directshowevrvideowindowcontrol.cpp
index fc1058d57..57d88326c 100644
--- a/src/plugins/directshow/player/directshowevrvideowindowcontrol.cpp
+++ b/src/plugins/directshow/player/directshowevrvideowindowcontrol.cpp
@@ -43,7 +43,7 @@
 
 DirectShowEvrVideoWindowControl::DirectShowEvrVideoWindowControl(QObject *parent)
     : EvrVideoWindowControl(parent)
-    , m_evrFilter(NULL)
+    , m_evrFilter(nullptr)
 {
 }
 
@@ -59,7 +59,7 @@ IBaseFilter *DirectShowEvrVideoWindowControl::filter()
         m_evrFilter = com_new<IBaseFilter>(clsid_EnhancedVideoRenderer);
         if (!setEvr(m_evrFilter)) {
             m_evrFilter->Release();
-            m_evrFilter = NULL;
+            m_evrFilter = nullptr;
         }
     }