diff options
| author | Yoann Lopes <yoann.lopes@digia.com> | 2014-09-01 14:19:53 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-09-01 14:19:53 +0200 |
| commit | bc1fa076c944c6af3250cb7210190da42a4de6ea (patch) | |
| tree | b6948fa95abbdd4ffbb30b76c7d3c09ae07e51db /src/plugins/avfoundation/camera/avfcameraservice.mm | |
| parent | 0c3438c9a12fbc607eada8f938cf0ad8fdea374d (diff) | |
| parent | 659f238bbbe040cce1bdf900f8f5500845ca8727 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4v5.4.0-alpha1
Diffstat (limited to 'src/plugins/avfoundation/camera/avfcameraservice.mm')
| -rw-r--r-- | src/plugins/avfoundation/camera/avfcameraservice.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/avfoundation/camera/avfcameraservice.mm b/src/plugins/avfoundation/camera/avfcameraservice.mm index 25111c5cc..966202ede 100644 --- a/src/plugins/avfoundation/camera/avfcameraservice.mm +++ b/src/plugins/avfoundation/camera/avfcameraservice.mm @@ -135,9 +135,9 @@ QMediaControl *AVFCameraService::requestControl(const char *name) void AVFCameraService::releaseControl(QMediaControl *control) { if (m_videoOutput == control) { - m_videoOutput = 0; m_session->setVideoOutput(0); - delete control; + delete m_videoOutput; + m_videoOutput = 0; } } |