summaryrefslogtreecommitdiffstats
path: root/chrome/gpu
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-19 21:20:39 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-19 21:20:39 +0000
commit853fff581a3005eac1f9dd3a060c5ec448218e4f (patch)
tree4000add1b1f3acce61931335663a71aa316bc42f /chrome/gpu
parent94b2c17468b276f873a74293459553cf9bf019a4 (diff)
downloadchromium_src-853fff581a3005eac1f9dd3a060c5ec448218e4f.zip
chromium_src-853fff581a3005eac1f9dd3a060c5ec448218e4f.tar.gz
chromium_src-853fff581a3005eac1f9dd3a060c5ec448218e4f.tar.bz2
Delay loading Media Foundations DLLs
Checked with Al we are already delay loading d3d9.dll, so add some extra for MF. BUG=53714 TEST=None Review URL: http://codereview.chromium.org/3859005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63112 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/gpu')
-rw-r--r--chrome/gpu/gpu_video_decoder.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/gpu/gpu_video_decoder.cc b/chrome/gpu/gpu_video_decoder.cc
index 6c90df5..466e85b 100644
--- a/chrome/gpu/gpu_video_decoder.cc
+++ b/chrome/gpu/gpu_video_decoder.cc
@@ -240,10 +240,8 @@ GpuVideoDecoder::GpuVideoDecoder(
#if defined(OS_WIN)
const CommandLine& command_line = *CommandLine::ForCurrentProcess();
if (command_line.HasSwitch(switches::kEnableAcceleratedDecoding)) {
- // 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());
+ decode_engine_.reset(new media::MftH264DecodeEngine(true));
+ video_device_.reset(new MftAngleVideoDevice());
}
#else
decode_engine_.reset(new FakeGlVideoDecodeEngine());