Index: content/gpu/gpu_main.cc |
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc |
index a5cb94e13f5ee87aef9f591c4594b1ddf02597a0..5dc5484d3a6293da46b4f9d89bc38fefa4436c8f 100644 |
--- a/content/gpu/gpu_main.cc |
+++ b/content/gpu/gpu_main.cc |
@@ -34,6 +34,7 @@ |
#include "sandbox/win/src/sandbox.h" |
#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) |
#include "content/common/gpu/media/omx_video_decode_accelerator.h" |
+#include "content/common/gpu/media/exynos_video_decode_accelerator.h" |
#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) |
#include "content/common/gpu/media/vaapi_video_decode_accelerator.h" |
#endif |
@@ -271,6 +272,7 @@ void WarmUpSandbox(const content::GPUInfo& gpu_info, |
#if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) |
OmxVideoDecodeAccelerator::PreSandboxInitialization(); |
+ ExynosVideoDecodeAccelerator::PreSandboxInitialization(); |
Ami GONE FROM CHROMIUM
2012/10/18 08:30:26
we should only load the relevant .so's.
sheu
2012/10/30 09:05:03
Done.
|
#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) |
VaapiVideoDecodeAccelerator::PreSandboxInitialization(); |
#endif |