Michael Froman
9235785dd0
Upstream commit: https://webrtc.googlesource.com/src/+/6f1452f6ec19947eed7e5ff5058aa0218b92e885 Remove redundant webrtc:: prefixes in ['modules/video_capture', 'system_wrappers'] Created by tools_webrtc/remove_extra_namespace.py --namespace webrtc and manual adjustments. This CL was uploaded by git cl split. R=eshr@webrtc.org No-IWYU: Refactoring Bug: webrtc:42232595 Change-Id: I681e5c44016aeaf06e1d18cc20a4d0777e4bcd59 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/396201 Auto-Submit: Harald Alvestrand <hta@webrtc.org> Reviewed-by: Evan Shrubsole <eshr@webrtc.org> Commit-Queue: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Evan Shrubsole <eshr@webrtc.org> Cr-Commit-Position: refs/heads/main@{#44889}
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From: Nico Grunbaum <na-g@nostrum.com>
|
|
Date: Thu, 22 Jun 2023 16:23:00 +0000
|
|
Subject: Bug 1837918 - libwebrtc update broke the build on
|
|
OpenBSD;r=mjf,webrtc-reviewers
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D181791
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/2a6a838b7021bb285f9485c2ceda6ba2543e0d6f
|
|
---
|
|
modules/video_capture/video_capture_options.h | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/modules/video_capture/video_capture_options.h b/modules/video_capture/video_capture_options.h
|
|
index 14fa4be252..7425f2c801 100644
|
|
--- a/modules/video_capture/video_capture_options.h
|
|
+++ b/modules/video_capture/video_capture_options.h
|
|
@@ -55,7 +55,7 @@ class RTC_EXPORT VideoCaptureOptions {
|
|
|
|
void Init(Callback* callback);
|
|
|
|
-#if defined(WEBRTC_LINUX)
|
|
+#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
|
|
bool allow_v4l2() const { return allow_v4l2_; }
|
|
void set_allow_v4l2(bool allow) { allow_v4l2_ = allow; }
|
|
#endif
|
|
@@ -68,7 +68,7 @@ class RTC_EXPORT VideoCaptureOptions {
|
|
#endif
|
|
|
|
private:
|
|
-#if defined(WEBRTC_LINUX)
|
|
+#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
|
|
bool allow_v4l2_ = false;
|
|
#endif
|
|
#if defined(WEBRTC_USE_PIPEWIRE)
|