Index: content/common/gpu/media/dxva_video_decode_accelerator.cc |
diff --git a/content/common/gpu/media/dxva_video_decode_accelerator.cc b/content/common/gpu/media/dxva_video_decode_accelerator.cc |
index 38030305f0f6fed02a9eb789ebf49ae0aae3e99a..4e3c673d21364ff16467851ebdc665c957bcf9e2 100644 |
--- a/content/common/gpu/media/dxva_video_decode_accelerator.cc |
+++ b/content/common/gpu/media/dxva_video_decode_accelerator.cc |
@@ -413,9 +413,8 @@ bool DXVAVideoDecodeAccelerator::CreateD3DDevManager() { |
} |
DXVAVideoDecodeAccelerator::DXVAVideoDecodeAccelerator( |
- media::VideoDecodeAccelerator::Client* client, |
const base::Callback<bool(void)>& make_context_current) |
- : client_(client), |
+ : client_(NULL), |
dev_manager_reset_token_(0), |
egl_config_(NULL), |
state_(kUninitialized), |
@@ -430,9 +429,12 @@ DXVAVideoDecodeAccelerator::~DXVAVideoDecodeAccelerator() { |
client_ = NULL; |
} |
-bool DXVAVideoDecodeAccelerator::Initialize(media::VideoCodecProfile profile) { |
+bool DXVAVideoDecodeAccelerator::Initialize(media::VideoCodecProfile profile, |
+ Client* client) { |
DCHECK(CalledOnValidThread()); |
+ client_ = client; |
+ |
// Not all versions of Windows 7 and later include Media Foundation DLLs. |
// Instead of crashing while delay loading the DLL when calling MFStartup() |
// below, probe whether we can successfully load the DLL now. |