diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 18:04:44 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 18:04:44 +0200 |
| commit | a7b67a97ecf0d5cf9d1c913c9367b7dd68c0108d (patch) | |
| tree | 5582b688420ea2a1673337a9845ea2a00aeceb9b /src/plugins/avfoundation/camera/avfcameraservice.mm | |
| parent | 762ff94f67a58df6c7c6315268ea64a2d2151f95 (diff) | |
| parent | ca94dc79b6f0e57ba7446a87c70398a178fbcac8 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I8b9177d90afac8b834d333efc6c22b6b35dceaf8
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 20792000a..77a145ba3 100644 --- a/src/plugins/avfoundation/camera/avfcameraservice.mm +++ b/src/plugins/avfoundation/camera/avfcameraservice.mm @@ -142,9 +142,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; } AVFMediaVideoProbeControl *videoProbe = qobject_cast<AVFMediaVideoProbeControl *>(control); if (videoProbe) { |