| Index: content/common/gpu/media/gpu_video_encode_accelerator.cc
|
| diff --git a/content/common/gpu/media/gpu_video_encode_accelerator.cc b/content/common/gpu/media/gpu_video_encode_accelerator.cc
|
| index 948542ed60ea862b8b74889ca6ae5735f397a96e..bc7022cdf6cd4ed32ea0c87dbc793012ee104ceb 100644
|
| --- a/content/common/gpu/media/gpu_video_encode_accelerator.cc
|
| +++ b/content/common/gpu/media/gpu_video_encode_accelerator.cc
|
| @@ -21,8 +21,8 @@
|
| #include "media/base/limits.h"
|
| #include "media/base/video_frame.h"
|
|
|
| -#if defined(OS_CHROMEOS)
|
| -#if defined(USE_V4L2_CODEC)
|
| +#if defined(OS_LINUX)
|
| +#if defined(OS_CHROMEOS) && defined(USE_V4L2_CODEC)
|
| #include "content/common/gpu/media/v4l2_video_encode_accelerator.h"
|
| #endif
|
| #if defined(ARCH_CPU_X86_FAMILY)
|
| @@ -220,7 +220,7 @@ GpuVideoEncodeAccelerator::CreateV4L2VEA() {
|
| scoped_ptr<media::VideoEncodeAccelerator>
|
| GpuVideoEncodeAccelerator::CreateVaapiVEA() {
|
| scoped_ptr<media::VideoEncodeAccelerator> encoder;
|
| -#if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
|
| +#if defined(OS_LINUX) && defined(ARCH_CPU_X86_FAMILY)
|
| const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
|
| if (!cmd_line->HasSwitch(switches::kDisableVaapiAcceleratedVideoEncode))
|
| encoder.reset(new VaapiVideoEncodeAccelerator());
|
|
|