Index: content/common/gpu/media/jpeg_decode_accelerator_unittest.cc |
diff --git a/content/common/gpu/media/jpeg_decode_accelerator_unittest.cc b/content/common/gpu/media/jpeg_decode_accelerator_unittest.cc |
index 53bc5d1cf50985d93001469fca0b403493030151..fada6e82c5329c9fc76f5a05c63e5c85558373a5 100644 |
--- a/content/common/gpu/media/jpeg_decode_accelerator_unittest.cc |
+++ b/content/common/gpu/media/jpeg_decode_accelerator_unittest.cc |
@@ -29,7 +29,7 @@ |
#include "third_party/libyuv/include/libyuv.h" |
#include "ui/gfx/codec/jpeg_codec.h" |
-#if defined(OS_CHROMEOS) |
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) |
#if defined(USE_V4L2_CODEC) |
#include "content/common/gpu/media/v4l2_device.h" |
#include "content/common/gpu/media/v4l2_jpeg_decode_accelerator.h" |
@@ -135,7 +135,7 @@ JpegClient::~JpegClient() { |
} |
void JpegClient::CreateJpegDecoder() { |
-#if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) |
+#if (defined(OS_CHROMEOS) || defined(OS_LINUX))&& defined(ARCH_CPU_X86_FAMILY) |
decoder_.reset( |
new VaapiJpegDecodeAccelerator(base::ThreadTaskRunnerHandle::Get())); |
#elif defined(OS_CHROMEOS) && defined(USE_V4L2_CODEC) |