diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:41:41 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 23:11:02 +0100 |
| commit | d04483a5c13b6b5ac463f2a8d584839eab9aeede (patch) | |
| tree | 042c340ea1265a9f3931c6d92c0fef8c9cb5edc1 /src/plugins/avfoundation/camera/avfcamerautility.mm | |
| parent | 950e9b472890478f0460a060ae08cc16a06ac659 (diff) | |
| parent | a3fb242676055355deb68788199ae59abe58ca41 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/plugins/avfoundation/mediaplayer/avfmediaplayersession.h
src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm
Change-Id: Ic43fb2a805ed9f0f2ea48993d47859716f1f11b4
Diffstat (limited to 'src/plugins/avfoundation/camera/avfcamerautility.mm')
| -rw-r--r-- | src/plugins/avfoundation/camera/avfcamerautility.mm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/avfoundation/camera/avfcamerautility.mm b/src/plugins/avfoundation/camera/avfcamerautility.mm index 22713d613..8a2254c2e 100644 --- a/src/plugins/avfoundation/camera/avfcamerautility.mm +++ b/src/plugins/avfoundation/camera/avfcamerautility.mm @@ -540,12 +540,14 @@ void qt_set_framerate_limits(AVCaptureDevice *captureDevice, qreal minFPS, qreal void qt_set_framerate_limits(AVCaptureDevice *captureDevice, AVCaptureConnection *videoConnection, qreal minFPS, qreal maxFPS) { + Q_UNUSED(videoConnection); Q_ASSERT(captureDevice); qt_set_framerate_limits(captureDevice, minFPS, maxFPS); } AVFPSRange qt_current_framerates(AVCaptureDevice *captureDevice, AVCaptureConnection *videoConnection) { + Q_UNUSED(videoConnection); Q_ASSERT(captureDevice); AVFPSRange fps; |