diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-19 22:24:13 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-19 22:24:13 +0000 |
| commit | 0c8526077e5d6265eaec6538b5e57fcdb64c19c0 (patch) | |
| tree | 6761d2edfe9f1338821e817a7d4940fcf4a6072a | |
| parent | e1ec422a7287acf4a5f4e9b907a8c5539ae88563 (diff) | |
| download | chromium_src-0c8526077e5d6265eaec6538b5e57fcdb64c19c0.zip chromium_src-0c8526077e5d6265eaec6538b5e57fcdb64c19c0.tar.gz chromium_src-0c8526077e5d6265eaec6538b5e57fcdb64c19c0.tar.bz2 | |
Revert "Delay loading Media Foundations DLLs"
This reverts commit a6294c5672df70fbd5191f25487119f0fa6a3ffe.
TBR=eroman
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/3913002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63120 0039d316-1c4b-4281-b951-d872f2087c98
| -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; |