diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:37 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:37 +0000 |
| commit | a90a5cba08fdf6c0ceb95101c275108a152a3aed (patch) | |
| tree | 532507288f3defd7f4dcf1af49698bcb76034855 /third_party/libwebrtc/moz-patch-stack/0023.patch | |
| parent | Adding debian version 126.0.1-1. (diff) | |
| download | firefox-a90a5cba08fdf6c0ceb95101c275108a152a3aed.tar.xz firefox-a90a5cba08fdf6c0ceb95101c275108a152a3aed.zip | |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'third_party/libwebrtc/moz-patch-stack/0023.patch')
| -rw-r--r-- | third_party/libwebrtc/moz-patch-stack/0023.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/third_party/libwebrtc/moz-patch-stack/0023.patch b/third_party/libwebrtc/moz-patch-stack/0023.patch index 43ee2f8941..6af712dfe3 100644 --- a/third_party/libwebrtc/moz-patch-stack/0023.patch +++ b/third_party/libwebrtc/moz-patch-stack/0023.patch @@ -78,7 +78,7 @@ index 23a8f4f3f3..b2c206d775 100644 #include <string.h> #include <sys/ioctl.h> diff --git a/modules/video_capture/linux/video_capture_v4l2.cc b/modules/video_capture/linux/video_capture_v4l2.cc -index 7a70c2ff88..00cede01cb 100644 +index 377c1ec878..a2e362bb94 100644 --- a/modules/video_capture/linux/video_capture_v4l2.cc +++ b/modules/video_capture/linux/video_capture_v4l2.cc @@ -12,7 +12,7 @@ @@ -105,7 +105,7 @@ index 7a70c2ff88..00cede01cb 100644 #include <new> #include <string> -@@ -405,16 +413,13 @@ bool VideoCaptureModuleV4L2::CaptureProcess() { +@@ -414,16 +422,13 @@ bool VideoCaptureModuleV4L2::CaptureProcess() { RTC_CHECK_RUNS_SERIALIZED(&capture_checker_); int retVal = 0; @@ -127,7 +127,7 @@ index 7a70c2ff88..00cede01cb 100644 { MutexLock lock(&capture_lock_); -@@ -424,12 +429,12 @@ bool VideoCaptureModuleV4L2::CaptureProcess() { +@@ -433,12 +438,12 @@ bool VideoCaptureModuleV4L2::CaptureProcess() { } if (retVal < 0 && errno != EINTR) { // continue if interrupted |