slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/5.4' into dev

Browse Source 
Change-Id: I8b9177d90afac8b834d333efc6c22b6b35dceaf8
This commit is contained in:
Frederik Gladhorn
2014-10-09 18:04:44 +02:00
parent 762ff94f67 ca94dc79b6
commit a7b67a97ec
166 changed files with 3766 additions and 5995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/avfoundation/camera/avfcameraservice.mm
View File

@@ -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) {