diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2020-01-15 19:08:48 +0200 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2020-01-15 19:08:48 +0200 |
| commit | 2091eac697ff6f7be03203d3180633a417c8c58c (patch) | |
| tree | 8b016b3960331af55345187d9f12450e73c4bd79 /src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm | |
| parent | 339e70a6f0da7c31c02f9744262d8f30b0dd04b8 (diff) | |
| parent | ee50d9a38689c2d56d530ef41f94ee0f6844b571 (diff) | |
Merge 5.14 into 5.14.1v5.14.1
Change-Id: Iedfc42f2d06213a0871ebc55dc9c3cac665c38c3
Diffstat (limited to 'src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm')
| -rw-r--r-- | src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm b/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm index a77d7de03..91f3cb7dc 100644 --- a/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm +++ b/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm @@ -185,7 +185,6 @@ void AVFCameraViewfinderSettingsControl2::setViewfinderSettings(const QCameraVie return; m_settings = settings; - applySettings(m_settings); } QVideoFrame::PixelFormat AVFCameraViewfinderSettingsControl2::QtPixelFormatFromCVFormat(unsigned avPixelFormat) |