From ed37e737534242e898dd82ef61cfdca2430181bc Mon Sep 17 00:00:00 2001
From: "hclam@chromium.org"
<hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 8 Oct 2010 08:20:29 +0000
Subject: Remove the usage of MFT related objects so they don't get linked.
Linking against MFT seems to create a runtime problem for XP.
TBR=scherkus
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/3548021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61929 0039d316-1c4b-4281-b951-d872f2087c98
---
chrome/gpu/gpu_video_decoder.cc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
(limited to 'chrome')
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());
--
cgit v1.1