summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-02-19 12:22:29 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-19 12:22:29 +0100
commit3d37f61816aafcb0ae817003a9f4822e81252d3a (patch)
tree73f6d7a24fcf3280ac6113e93f6ba5737b9e279d
parent039f3e49c7ba28dcf00cffb76e7af62fe52b1026 (diff)
downloadUXP-3d37f61816aafcb0ae817003a9f4822e81252d3a.tar
UXP-3d37f61816aafcb0ae817003a9f4822e81252d3a.tar.gz
UXP-3d37f61816aafcb0ae817003a9f4822e81252d3a.tar.lz
UXP-3d37f61816aafcb0ae817003a9f4822e81252d3a.tar.xz
UXP-3d37f61816aafcb0ae817003a9f4822e81252d3a.zip
Remove useless version check from PDMFactory.
-rw-r--r--dom/media/platforms/PDMFactory.cpp15
1 files changed, 1 insertions, 14 deletions
diff --git a/dom/media/platforms/PDMFactory.cpp b/dom/media/platforms/PDMFactory.cpp
index a72d910f5..c1e58fdc2 100644
--- a/dom/media/platforms/PDMFactory.cpp
+++ b/dom/media/platforms/PDMFactory.cpp
@@ -47,10 +47,6 @@
#include "MP4Decoder.h"
#include "mozilla/dom/RemoteVideoDecoder.h"
-#ifdef XP_WIN
-#include "mozilla/WindowsVersion.h"
-#endif
-
#include "mp4_demuxer/H264.h"
namespace mozilla {
@@ -367,16 +363,7 @@ PDMFactory::CreatePDMs()
}
#endif
#ifdef XP_WIN
- if (MediaPrefs::PDMWMFEnabled() && IsVistaOrLater() && !IsWin7AndPre2000Compatible()) {
- // *Only* use WMF on Vista and later, as if Firefox is run in Windows 95
- // compatibility mode on Windows 7 (it does happen!) we may crash trying
- // to startup WMF. So we need to detect the OS version here, as in
- // compatibility mode IsVistaOrLater() and friends behave as if we're on
- // the emulated version of Windows. See bug 1279171.
- // Additionally, we don't want to start the RemoteDecoderModule if we
- // expect it's not going to work (i.e. on Windows older than Vista).
- // IsWin7AndPre2000Compatible() uses GetVersionEx as the user specified OS version can
- // be reflected when compatibility mode is in effect.
+ if (MediaPrefs::PDMWMFEnabled()) {
m = new WMFDecoderModule();
RefPtr<PlatformDecoderModule> remote = new dom::RemoteDecoderModule(m);
StartupPDM(remote);