summaryrefslogtreecommitdiffstats
path: root/dom/media/ipc/VideoDecoderParent.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'dom/media/ipc/VideoDecoderParent.cpp')
-rw-r--r--dom/media/ipc/VideoDecoderParent.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/dom/media/ipc/VideoDecoderParent.cpp b/dom/media/ipc/VideoDecoderParent.cpp
index 6c95f31..24eb234 100644
--- a/dom/media/ipc/VideoDecoderParent.cpp
+++ b/dom/media/ipc/VideoDecoderParent.cpp
@@ -11,6 +11,7 @@
#include "mozilla/layers/VideoBridgeChild.h"
#include "mozilla/layers/ImageClient.h"
#include "MediaInfo.h"
+#include "PDMFactory.h"
#include "VideoDecoderManagerParent.h"
#ifdef XP_WIN
#include "WMFDecoderModule.h"
@@ -61,9 +62,11 @@ VideoDecoderParent::VideoDecoderParent(
mKnowsCompositor->IdentifyTextureHost(aIdentifier);
#ifdef XP_WIN
+ // Ensure everything is properly initialized on the right thread.
+ PDMFactory::EnsureInit();
+
// TODO: Ideally we wouldn't hardcode the WMF PDM, and we'd use the normal PDM
// factory logic for picking a decoder.
- WMFDecoderModule::Init();
RefPtr<WMFDecoderModule> pdm(new WMFDecoderModule());
pdm->Startup();