From 5d1eb0d3aa590338930553cb7e09c43c4840ef1a Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Tue, 20 Feb 2018 10:19:17 +0100
Subject: Remove more obsolete checks in dom/media and ipc.

---
 dom/media/platforms/wmf/WMFUtils.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'dom/media/platforms/wmf')

diff --git a/dom/media/platforms/wmf/WMFUtils.cpp b/dom/media/platforms/wmf/WMFUtils.cpp
index 208131fef..b5747e326 100644
--- a/dom/media/platforms/wmf/WMFUtils.cpp
+++ b/dom/media/platforms/wmf/WMFUtils.cpp
@@ -210,16 +210,12 @@ MFStartup()
     return hr;
   }
 
-  const int MF_VISTA_VERSION = (0x0001 << 16 | MF_API_VERSION);
-  const int MF_WIN7_VERSION = (0x0002 << 16 | MF_API_VERSION);
+  const int MF_VERSION = (0x0002 << 16 | MF_API_VERSION);
 
   // decltype is unusable for functions having default parameters
   DECL_FUNCTION_PTR(MFStartup, ULONG, DWORD);
   ENSURE_FUNCTION_PTR_(MFStartup, Mfplat.dll)
-  if (!IsWin7OrLater())
-    return MFStartupPtr(MF_VISTA_VERSION, MFSTARTUP_FULL);
-  else
-    return MFStartupPtr(MF_WIN7_VERSION, MFSTARTUP_FULL);
+  return MFStartupPtr(MF_VERSION, MFSTARTUP_FULL);
 }
 
 HRESULT
-- 
cgit v1.2.3