| Index: content/public/gpu/gpu_video_decode_accelerator_factory.cc
|
| diff --git a/content/public/gpu/gpu_video_decode_accelerator_factory.cc b/content/public/gpu/gpu_video_decode_accelerator_factory.cc
|
| index 57b46a86f10ae50e182fcc7dd1e7744deabe40dd..a465b1761267925acbbfe390060cb34ac2718e13 100644
|
| --- a/content/public/gpu/gpu_video_decode_accelerator_factory.cc
|
| +++ b/content/public/gpu/gpu_video_decode_accelerator_factory.cc
|
| @@ -44,21 +44,18 @@ GpuVideoDecodeAcceleratorFactory::CreateWithGLES2Decoder(
|
|
|
| // static
|
| gpu::VideoDecodeAcceleratorCapabilities
|
| -GpuVideoDecodeAcceleratorFactory::GetDecoderCapabilities(
|
| - const gpu::GpuPreferences& gpu_preferences) {
|
| - return GpuVideoDecodeAcceleratorFactoryImpl::GetDecoderCapabilities(
|
| - gpu_preferences);
|
| +GpuVideoDecodeAcceleratorFactory::GetDecoderCapabilities() {
|
| + return GpuVideoDecodeAcceleratorFactoryImpl::GetDecoderCapabilities();
|
| }
|
|
|
| scoped_ptr<media::VideoDecodeAccelerator>
|
| GpuVideoDecodeAcceleratorFactory::CreateVDA(
|
| media::VideoDecodeAccelerator::Client* client,
|
| - const media::VideoDecodeAccelerator::Config& config,
|
| - const gpu::GpuPreferences& gpu_preferences) {
|
| + const media::VideoDecodeAccelerator::Config& config) {
|
| if (!gvdafactory_impl_)
|
| return nullptr;
|
|
|
| - return gvdafactory_impl_->CreateVDA(client, config, gpu_preferences);
|
| + return gvdafactory_impl_->CreateVDA(client, config);
|
| }
|
|
|
| GpuVideoDecodeAcceleratorFactory::GpuVideoDecodeAcceleratorFactory(
|
|
|