diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-22 03:01:21 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-22 03:01:21 +0100 |
| commit | 70f5eb4f707ce84cbf153899d33d6bd8656be682 (patch) | |
| tree | f95dcf6c1ecb9d09f84e1313e84042c66c0501e1 /src/plugins/avfoundation/camera/avfcamerautility.h | |
| parent | ccde3b75e4ff53e711439e82e1c5640fac225d8e (diff) | |
| parent | 12460a14bde44d1ff7bedd75bc87c7f22d096588 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1
Change-Id: I04934575bd661b80b1f012a7e825dcd753d26908
Diffstat (limited to 'src/plugins/avfoundation/camera/avfcamerautility.h')
| -rw-r--r-- | src/plugins/avfoundation/camera/avfcamerautility.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/avfoundation/camera/avfcamerautility.h b/src/plugins/avfoundation/camera/avfcamerautility.h index 370302b1c..33956fc8a 100644 --- a/src/plugins/avfoundation/camera/avfcamerautility.h +++ b/src/plugins/avfoundation/camera/avfcamerautility.h @@ -161,7 +161,7 @@ QSize qt_device_format_high_resolution(AVCaptureDeviceFormat *format); QSize qt_device_format_pixel_aspect_ratio(AVCaptureDeviceFormat *format); QVector<AVFPSRange> qt_device_format_framerates(AVCaptureDeviceFormat *format); AVCaptureDeviceFormat *qt_find_best_resolution_match(AVCaptureDevice *captureDevice, const QSize &res, - FourCharCode preferredFormat); + FourCharCode preferredFormat, bool stillImage = true); AVCaptureDeviceFormat *qt_find_best_framerate_match(AVCaptureDevice *captureDevice, FourCharCode preferredFormat, Float64 fps); |