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

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

Browse Source 
Change-Id: If8e5050901a320f1ff692e842f173c0062bed5fe
This commit is contained in:
Frederik Gladhorn
2014-07-22 20:23:12 +02:00
parent 39c2694414 2bc7a39a0d
commit 86d5c7e4dc
34 changed files with 1314 additions and 1947 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/avfoundation/camera/avfmediarecordercontrol.mm
View File

@@ -250,10 +250,8 @@ void AVFMediaRecorderControl::setState(QMediaRecorder::State state)
qDebugCamera() << "Video capture location:" << actualLocation.toString();
NSString *urlString = [NSString stringWithUTF8String:actualLocation.toString().toUtf8().constData()];
NSURL *fileURL = [NSURL URLWithString:urlString];
[m_movieOutput startRecordingToOutputFileURL:fileURL recordingDelegate:m_recorderDelagate];
[m_movieOutput startRecordingToOutputFileURL:actualLocation.toNSURL()
recordingDelegate:m_recorderDelagate];
Q_EMIT actualLocationChanged(actualLocation);
} else {