Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta4

Change-Id: Icb722ebe5b9b02791cf3593f2347e398deb837fe

1 files changed, 6 insertions, 6 deletions

diff --git a/src/plugins/wmf/player/mfplayersession.cpp b/src/plugins/wmf/player/mfplayersession.cpp
index 24bfda833..9761fd993 100644
--- a/src/plugins/wmf/player/mfplayersession.cpp
+++ b/src/plugins/wmf/player/mfplayersession.cpp
@@ -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;
 }