06e90addc7
We already cherry-picked this when we vendored f30c044cf9. Upstream commit: https://webrtc.googlesource.com/src/+/995688c8e85b520d50961486abbe0cc03eae9558 Revert "more p2p cleanups" This reverts commit f30c044cf9bd06f91017c171d98690094ce6d88b. Reason for revert: breaks roll to chromium: https://ci.chromium.org/ui/p/chromium/builders/try/mac_chromium_compile_dbg_ng/2290104/overview Original change's description: > more p2p cleanups > > Move test code from p2p/base and rtc_base/ into p2p/test/ > This p2p/base much less crowded and > clarifies that the rtc_base/nat* is in fact only test code. > > BUG=webrtc:0 > > Change-Id: I4d14fae24cb0eff6783962f4b4483b560367ca5d > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/378900 > Commit-Queue: Jonas Oreland <jonaso@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Auto-Submit: Jonas Oreland <jonaso@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#43995} Bug: webrtc:0 Change-Id: I6c79fa85f53fdb9a1dacbe38911771f9a4289c76 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379040 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Owners-Override: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43999} Differential Revision: https://phabricator.services.mozilla.com/D244009
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 6f72f7927e..37965305d9 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)
|