media/filters/mock_gpu_video_accelerator_factories.h - Issue 668633002: Duplicate VideoEncodeAccelerator::SupportedProfile in gpu_info.h.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/filters/mock_gpu_video_accelerator_factories.h

Issue 668633002: Duplicate VideoEncodeAccelerator::SupportedProfile in gpu_info.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: media/filters/mock_gpu_video_accelerator_factories.h

diff --git a/media/filters/mock_gpu_video_accelerator_factories.h b/media/filters/mock_gpu_video_accelerator_factories.h

index 949f35d79a72d7083cf30ba268b0d179bcf1f199..583d50c12614ed83f4c89fca71d89ad0f295877f 100644

--- a/media/filters/mock_gpu_video_accelerator_factories.h

+++ b/media/filters/mock_gpu_video_accelerator_factories.h

@@ -46,7 +46,7 @@ class MockGpuVideoAcceleratorFactories : public GpuVideoAcceleratorFactories {

MOCK_METHOD1(CreateSharedMemory, base::SharedMemory*(size_t size));

MOCK_METHOD0(GetTaskRunner, scoped_refptr<base::SingleThreadTaskRunner>());

MOCK_METHOD0(GetVideoEncodeAcceleratorSupportedProfiles,

- std::vector<VideoEncodeAccelerator::SupportedProfile>());

+ std::vector<gpu::VideoEncodeAcceleratorSupportedProfile>());

virtual scoped_ptr<VideoDecodeAccelerator> CreateVideoDecodeAccelerator()

override;

« gpu/config/gpu_info.h ('K') | « media/filters/gpu_video_accelerator_factories.h ('k') | media/video/video_encode_accelerator.h » ('j') | no next file with comments »