diff options
| -rw-r--r-- | chrome/gpu/gpu_video_decoder.cc | 6 | ||||
| -rw-r--r-- | media/video/mft_h264_decode_engine.cc | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/chrome/gpu/gpu_video_decoder.cc b/chrome/gpu/gpu_video_decoder.cc index 466e85b..6c90df5 100644 --- a/chrome/gpu/gpu_video_decoder.cc +++ b/chrome/gpu/gpu_video_decoder.cc @@ -240,8 +240,10 @@ GpuVideoDecoder::GpuVideoDecoder( #if defined(OS_WIN) const CommandLine& command_line = *CommandLine::ForCurrentProcess(); if (command_line.HasSwitch(switches::kEnableAcceleratedDecoding)) { - decode_engine_.reset(new media::MftH264DecodeEngine(true)); - video_device_.reset(new MftAngleVideoDevice()); + // The following code are removed so that we don't link them. + // TODO(hclam): Enable the code once the crash is solved on XP. + // decode_engine_.reset(new media::MftH264DecodeEngine(true)); + // video_device_.reset(new MftAngleVideoDevice()); } #else decode_engine_.reset(new FakeGlVideoDecodeEngine()); diff --git a/media/video/mft_h264_decode_engine.cc b/media/video/mft_h264_decode_engine.cc index ea2527b..4558b7c 100644 --- a/media/video/mft_h264_decode_engine.cc +++ b/media/video/mft_h264_decode_engine.cc @@ -22,10 +22,6 @@ #pragma comment(lib, "d3d9.lib") #pragma comment(lib, "mf.lib") #pragma comment(lib, "mfplat.lib") -#pragma comment(linker, "/DelayLoad:dxva2.dll") -#pragma comment(linker, "/DelayLoad:d3d9.dll") -#pragma comment(linker, "/DelayLoad:mf.dll") -#pragma comment(linker, "/DelayLoad:mfplat.dll") using base::TimeDelta; |