3 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/wmf/player/mfplayersession.cpp b/src/plugins/wmf/player/mfplayersession.cpp
index 24bfda833..1d145edc4 100644
--- a/src/plugins/wmf/player/mfplayersession.cpp
+++ b/src/plugins/wmf/player/mfplayersession.cpp
@@ -56,7 +56,7 @@
 #include "mfplayersession.h"
 #include "mfplayerservice.h"
 #include "mfmetadatacontrol.h"
-#include <Mferror.h>
+#include <mferror.h>
 #include <nserror.h>
 #include "sourceresolver.h"
 #include "samplegrabber.h"
@@ -277,10 +277,13 @@ MFPlayerSession::MediaType MFPlayerSession::getStreamType(IMFStreamDescriptor *s
     if (!stream)
         return Unknown;
 
-    IMFMediaTypeHandler *typeHandler = NULL;
-    if (SUCCEEDED(stream->GetMediaTypeHandler(&typeHandler))) {
+    struct SafeRelease {
+        IMFMediaTypeHandler *ptr = nullptr;
+        ~SafeRelease() { if (ptr) ptr->Release(); }
+    } typeHandler;
+    if (SUCCEEDED(stream->GetMediaTypeHandler(&typeHandler.ptr))) {
         GUID guidMajorType;
-        if (SUCCEEDED(typeHandler->GetMajorType(&guidMajorType))) {
+        if (SUCCEEDED(typeHandler.ptr->GetMajorType(&guidMajorType))) {
             if (guidMajorType == MFMediaType_Audio)
                 return Audio;
             else if (guidMajorType == MFMediaType_Video)
@@ -288,9 +291,6 @@ MFPlayerSession::MediaType MFPlayerSession::getStreamType(IMFStreamDescriptor *s
         }
     }
 
-    if (typeHandler)
-        typeHandler->Release();
-
     return Unknown;
 }
 
diff --git a/src/plugins/wmf/player/mftvideo.cpp b/src/plugins/wmf/player/mftvideo.cpp
index 879911d55..9dce654f2 100644
--- a/src/plugins/wmf/player/mftvideo.cpp
+++ b/src/plugins/wmf/player/mftvideo.cpp
@@ -40,7 +40,7 @@
 #include "mftvideo.h"
 #include "mfvideoprobecontrol.h"
 #include <private/qmemoryvideobuffer_p.h>
-#include <Mferror.h>
+#include <mferror.h>
 #include <strmif.h>
 #include <uuids.h>
 #include <InitGuid.h>
diff --git a/src/plugins/wmf/sourceresolver.cpp b/src/plugins/wmf/sourceresolver.cpp
index c6f4e8566..15ef6f0ab 100644
--- a/src/plugins/wmf/sourceresolver.cpp
+++ b/src/plugins/wmf/sourceresolver.cpp
@@ -39,7 +39,7 @@
 
 #include "mfstream.h"
 #include "sourceresolver.h"
-#include <Mferror.h>
+#include <mferror.h>
 #include <nserror.h>
 #include <QtCore/qfile.h>
 #include <QtCore/qdebug.h>