summaryrefslogtreecommitdiff
path: root/chromium/media
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-11-11 12:55:39 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-11-11 11:58:27 +0000
commitc4e09a87ba38e76a4f1dff610de8e2f24f7841c7 (patch)
treebe77b360452683ba5ed204d0121309bfdf447c7b /chromium/media
parent1943b3c2a1dcee36c233724fc4ee7613d71b9cf6 (diff)
downloadqtwebengine-chromium-c4e09a87ba38e76a4f1dff610de8e2f24f7841c7.tar.gz
BASELINE: Update Chromium to 94.0.4606.121
Change-Id: Id2b9a0d48e59484ca851391169a239cf08685155 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/media')
-rw-r--r--chromium/media/capture/video/chromeos/camera_hal_delegate.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/chromium/media/capture/video/chromeos/camera_hal_delegate.cc b/chromium/media/capture/video/chromeos/camera_hal_delegate.cc
index 9b83d4c0f9a..0fbc5f75ca4 100644
--- a/chromium/media/capture/video/chromeos/camera_hal_delegate.cc
+++ b/chromium/media/capture/video/chromeos/camera_hal_delegate.cc
@@ -646,6 +646,7 @@ void CameraHalDelegate::OnGotCameraInfoOnIpcThread(
DVLOG(1) << "Got camera info of camera " << camera_id;
if (result) {
LOG(ERROR) << "Failed to get camera info. Camera id: " << camera_id;
+ return;
}
SortCameraMetadata(&camera_info->static_camera_characteristics);