content/common/gpu/media/dxva_video_decode_accelerator.h - Issue 377723002: Fixes for re-enabling more MSVC level 4 warnings: content/ edition

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: content/common/gpu/media/dxva_video_decode_accelerator.h

Issue 377723002: Fixes for re-enabling more MSVC level 4 warnings: content/ edition (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 5 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:

Index: content/common/gpu/media/dxva_video_decode_accelerator.h

diff --git a/content/common/gpu/media/dxva_video_decode_accelerator.h b/content/common/gpu/media/dxva_video_decode_accelerator.h

index 74ca5990b47cb33069c5727bdf05df4d1e84a034..0b92551e5bef3f1ea9d19b7a4f863cf55fe9d880 100644

--- a/content/common/gpu/media/dxva_video_decode_accelerator.h

+++ b/content/common/gpu/media/dxva_video_decode_accelerator.h

@@ -6,7 +6,12 @@

#define CONTENT_COMMON_GPU_MEDIA_DXVA_VIDEO_DECODE_ACCELERATOR_H_

#include <d3d9.h>

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

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

+#pragma warning(push)

+#pragma warning(disable:4201)

#include <dxva2api.h>

+#pragma warning(pop)

#include <list>

#include <map>

#include <mfidl.h>