diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-02-19 10:04:30 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-02-19 10:05:11 +0100 |
| commit | 13882cd5da72bf0f6657752344793103a43a8e41 (patch) | |
| tree | 6a3323763df5e42fc5d25a84786efff1f41c256e /src/plugins/avfoundation/camera/avfcamerasession.h | |
| parent | 391e8a7147edb1cdff6f1362ae0d3be4e7271ea7 (diff) | |
| parent | 01714ef0c5ee80544e3799ae2a66d9a611c9d71f (diff) | |
Merge remote-tracking branch 'origin/dev' into stable
Change-Id: I84b36fa41f3d5f8fea2dec2545f72ebe6a0c7908
Diffstat (limited to 'src/plugins/avfoundation/camera/avfcamerasession.h')
| -rw-r--r-- | src/plugins/avfoundation/camera/avfcamerasession.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/avfoundation/camera/avfcamerasession.h b/src/plugins/avfoundation/camera/avfcamerasession.h index 48681aae7..2630a35f7 100644 --- a/src/plugins/avfoundation/camera/avfcamerasession.h +++ b/src/plugins/avfoundation/camera/avfcamerasession.h @@ -64,6 +64,7 @@ public: void setVideoOutput(AVFVideoRendererControl *output); AVCaptureSession *captureSession() const { return m_captureSession; } + AVCaptureDevice *videoCaptureDevice() const; QCamera::State state() const; QCamera::State requestedState() const { return m_state; } |