summaryrefslogtreecommitdiffstats
path: root/remoting/host
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-12 10:35:33 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-12 10:35:33 +0000
commit34a0d6d0a29eb88151596d491f1ac541e6d255c0 (patch)
tree6c1248996eb14f3bef97abe9b73964b71feb0a51 /remoting/host
parent3c14b6f742687edae55cef63c3578d85f20e4161 (diff)
downloadchromium_src-34a0d6d0a29eb88151596d491f1ac541e6d255c0.zip
chromium_src-34a0d6d0a29eb88151596d491f1ac541e6d255c0.tar.gz
chromium_src-34a0d6d0a29eb88151596d491f1ac541e6d255c0.tar.bz2
Build remoting with libvpx in all platforms
Now that libvpx is building on ARM remoting should use it on all platforms. BUG=47285 TEST=chromoting runs on ARM Review URL: http://codereview.chromium.org/7623020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96543 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host')
-rw-r--r--remoting/host/chromoting_host.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc
index 1d42059..1aeaae7 100644
--- a/remoting/host/chromoting_host.cc
+++ b/remoting/host/chromoting_host.cc
@@ -415,13 +415,9 @@ Encoder* ChromotingHost::CreateEncoder(const protocol::SessionConfig* config) {
return EncoderRowBased::CreateVerbatimEncoder();
} else if (video_config.codec == protocol::ChannelConfig::CODEC_ZIP) {
return EncoderRowBased::CreateZlibEncoder();
- }
- // TODO(sergeyu): Enable VP8 on ARM builds.
-#if !defined(ARCH_CPU_ARM_FAMILY)
- else if (video_config.codec == protocol::ChannelConfig::CODEC_VP8) {
+ } else if (video_config.codec == protocol::ChannelConfig::CODEC_VP8) {
return new remoting::EncoderVp8();
}
-#endif
return NULL;
}