projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6a50a51
)
Fix resource leak with iOS camera due to failure to remove AVCaptureSession input...
author
Ehren Metcalfe
<ehren.m@gmail.com>
Sat, 31 May 2014 23:41:16 +0000
(19:41 -0400)
committer
Dikay900
<dark900@xyz.de>
Sat, 23 May 2015 15:36:42 +0000
(17:36 +0200)
Conflicts:
modules/highgui/src/cap_ios_abstract_camera.mm
modules/videoio/src/cap_ios_abstract_camera.mm
patch
|
blob
|
history
diff --git
a/modules/videoio/src/cap_ios_abstract_camera.mm
b/modules/videoio/src/cap_ios_abstract_camera.mm
index
1ded46a
..
565807c
100644
(file)
--- a/
modules/videoio/src/cap_ios_abstract_camera.mm
+++ b/
modules/videoio/src/cap_ios_abstract_camera.mm
@@
-193,6
+193,13
@@
// Release any retained subviews of the main view.
// e.g. self.myOutlet = nil;
+ for (AVCaptureInput *input in self.captureSession.inputs) {
+ [self.captureSession removeInput:input];
+ }
+
+ for (AVCaptureOutput *output in self.captureSession.outputs) {
+ [self.captureSession removeOutput:output];
+ }
[self.captureSession stopRunning];
self.captureSession = nil;