media/capture/video/linux/video_capture_device_linux.cc - Issue 1542013004: Switch to standard integer types in media/, take 2.

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/capture/video/linux/video_capture_device_linux.cc

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: more stddef Created 5 years 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

« no previous file with comments | « media/capture/video/linux/video_capture_device_linux.h ('k') | media/capture/video/mac/video_capture_device_avfoundation_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/capture/video/linux/video_capture_device_linux.cc

diff --git a/media/capture/video/linux/video_capture_device_linux.cc b/media/capture/video/linux/video_capture_device_linux.cc

index e6390b5ffff63dd1009af65a652206fe8252fd12..32f30e049ce376e45fe486bc1575696dc26eb9db 100644

--- a/media/capture/video/linux/video_capture_device_linux.cc

+++ b/media/capture/video/linux/video_capture_device_linux.cc

@@ -4,18 +4,21 @@

#include "media/capture/video/linux/video_capture_device_linux.h"

-#if defined(OS_OPENBSD)

-#include <sys/videoio.h>

-#else

-#include <linux/videodev2.h>

-#endif

+#include <stddef.h>

#include <list>

#include "base/bind.h"

#include "base/strings/stringprintf.h"

+#include "build/build_config.h"

#include "media/capture/video/linux/v4l2_capture_delegate.h"

+#if defined(OS_OPENBSD)

+#include <sys/videoio.h>

+#else

+#include <linux/videodev2.h>

+#endif

namespace media {

// USB VID and PID are both 4 bytes long.