diff --git a/modules/video_capture/BUILD.gn b/modules/video_capture/BUILD.gn index f0b180ce61..43987eabc0 100644 --- a/modules/video_capture/BUILD.gn +++ b/modules/video_capture/BUILD.gn @@ -71,8 +71,6 @@ if (!build_with_chromium) { rtc_source_set("video_capture_internal_impl_objc") { visibility = [ ":video_capture_internal_impl" ] - configs += [ "../..:no_global_constructors" ] - deps = [ ":video_capture_module", "../../rtc_base:rtc_base_approved", diff --git a/modules/video_capture/objc/device_info.mm b/modules/video_capture/objc/device_info.mm index 42c1cd4395..0af15e2169 100644 --- a/modules/video_capture/objc/device_info.mm +++ b/modules/video_capture/objc/device_info.mm @@ -24,12 +24,6 @@ using namespace webrtc; using namespace videocapturemodule; -static NSArray* camera_presets = @[ - AVCaptureSessionPreset352x288, - AVCaptureSessionPreset640x480, - AVCaptureSessionPreset1280x720 -]; - #define IOS_UNSUPPORTED() \ RTC_LOG(LS_ERROR) << __FUNCTION__ << " is not supported on the iOS platform."; \ return -1; @@ -47,6 +41,11 @@ DeviceInfoIos::~DeviceInfoIos() {} int32_t DeviceInfoIos::Init() { // Fill in all device capabilities. + const NSArray* camera_presets = @[ + AVCaptureSessionPreset352x288, + AVCaptureSessionPreset640x480, + AVCaptureSessionPreset1280x720 + ]; int deviceCount = [DeviceInfoIosObjC captureDeviceCount]; for (int i = 0; i < deviceCount; i++) {