media/gpu/dxva_video_decode_accelerator_win.h - Issue 2010793003: Clean up media header include guards

Side by Side Diff

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

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

Side by Side Diff: media/gpu/dxva_video_decode_accelerator_win.h

Issue 2010793003: Clean up media header include guards (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update references to the param traits guard Created 4 years, 6 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 unified diff | Download patch

« no previous file with comments | « media/gpu/avda_state_provider.h ('k') | media/gpu/vt_mac.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef MEDIA_GPU_DXVA_VIDEO_DECODE_ACCELERATOR_H_	5 #ifndef MEDIA_GPU_DXVA_VIDEO_DECODE_ACCELERATOR_WIN_H_

6 #define MEDIA_GPU_DXVA_VIDEO_DECODE_ACCELERATOR_H_	6 #define MEDIA_GPU_DXVA_VIDEO_DECODE_ACCELERATOR_WIN_H_

7	7

8 #include <d3d11.h>	8 #include <d3d11.h>

9 #include <d3d9.h>	9 #include <d3d9.h>

10 #include <initguid.h>	10 #include <initguid.h>

11 #include <stdint.h>	11 #include <stdint.h>

12	12

13 // Work around bug in this header by disabling the relevant warning for it.	13 // Work around bug in this header by disabling the relevant warning for it.

14 // https://connect.microsoft.com/VisualStudio/feedback/details/911260/dxva2api-h -in-win8-sdk-triggers-c4201-with-w4	14 // https://connect.microsoft.com/VisualStudio/feedback/details/911260/dxva2api-h -in-win8-sdk-triggers-c4201-with-w4

15 #pragma warning(push)	15 #pragma warning(push)

16 #pragma warning(disable : 4201)	16 #pragma warning(disable : 4201)

(...skipping 476 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
493 base::WeakPtrFactory<DXVAVideoDecodeAccelerator> weak_this_factory_;	493 base::WeakPtrFactory<DXVAVideoDecodeAccelerator> weak_this_factory_;

494	494

495 // Function pointer for the MFCreateDXGIDeviceManager API.	495 // Function pointer for the MFCreateDXGIDeviceManager API.

496 static CreateDXGIDeviceManager create_dxgi_device_manager_;	496 static CreateDXGIDeviceManager create_dxgi_device_manager_;

497	497

498 DISALLOW_COPY_AND_ASSIGN(DXVAVideoDecodeAccelerator);	498 DISALLOW_COPY_AND_ASSIGN(DXVAVideoDecodeAccelerator);

499 };	499 };

500	500

501 } // namespace media	501 } // namespace media

502	502

503 #endif // MEDIA_GPU_DXVA_VIDEO_DECODE_ACCELERATOR_H_	503 #endif // MEDIA_GPU_DXVA_VIDEO_DECODE_ACCELERATOR_WIN_H_

OLD	NEW