| Index: media/gpu/jpeg_decode_accelerator_unittest.cc
|
| diff --git a/media/gpu/jpeg_decode_accelerator_unittest.cc b/media/gpu/jpeg_decode_accelerator_unittest.cc
|
| index cc5e2c60d0dad93251d8c3975350315eae704dc0..00fa4f5b2121de602ba67edf26d6b31cffffe09a 100644
|
| --- a/media/gpu/jpeg_decode_accelerator_unittest.cc
|
| +++ b/media/gpu/jpeg_decode_accelerator_unittest.cc
|
| @@ -137,8 +137,7 @@ void JpegClient::CreateJpegDecoder() {
|
| decoder_.reset(
|
| new VaapiJpegDecodeAccelerator(base::ThreadTaskRunnerHandle::Get()));
|
| #elif defined(OS_CHROMEOS) && defined(USE_V4L2_CODEC)
|
| - scoped_refptr<V4L2Device> device =
|
| - V4L2Device::Create(V4L2Device::kJpegDecoder);
|
| + scoped_refptr<V4L2Device> device = V4L2Device::Create();
|
| if (!device.get()) {
|
| LOG(ERROR) << "V4L2Device::Create failed";
|
| SetState(CS_ERROR);
|
| @@ -562,7 +561,10 @@ int main(int argc, char** argv) {
|
| }
|
| if (it->first == "v" || it->first == "vmodule")
|
| continue;
|
| - LOG(FATAL) << "Unexpected switch: " << it->first << ":" << it->second;
|
| + if (it->first == "h" || it->first == "help")
|
| + continue;
|
| + LOG(ERROR) << "Unexpected switch: " << it->first << ":" << it->second;
|
| + return -EINVAL;
|
| }
|
| #if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
|
| media::VaapiWrapper::PreSandboxInitialization();
|
|
|