diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:01:58 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:01:58 +0100 |
commit | 2e9d1fa5ef1367e5d2ace88bc47f93b8fe8a039b (patch) | |
tree | e34abd8ef99ae1abb2730a3772debe3fc9b26144 /src/plugins/avfoundation/camera/avfcamerautility.mm | |
parent | b8609cd3ffeddd02a514c6b5f9170c8017966e41 (diff) | |
parent | 7638848d2486e2fac9764b60a99de08f50adc8eb (diff) | |
download | qtmultimedia-2e9d1fa5ef1367e5d2ace88bc47f93b8fe8a039b.tar.gz |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I7566f543ce11ff6cddc4d17e2c258a582f365b65
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; |