summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--media/video/capture/mac/video_capture_device_qtkit_mac.mm4
1 files changed, 1 insertions, 3 deletions
diff --git a/media/video/capture/mac/video_capture_device_qtkit_mac.mm b/media/video/capture/mac/video_capture_device_qtkit_mac.mm
index 79f8a10..cd9c6d3 100644
--- a/media/video/capture/mac/video_capture_device_qtkit_mac.mm
+++ b/media/video/capture/mac/video_capture_device_qtkit_mac.mm
@@ -219,10 +219,8 @@
- (void)stopCapture {
if ([[captureSession_ inputs] count] == 1) {
- // |stopRunning| must be called before |removeInput:| to avoid a deadlock
- // with device enumeration when the active camera is unplugged.
- [captureSession_ stopRunning];
[captureSession_ removeInput:captureDeviceInput_];
+ [captureSession_ stopRunning];
}
[[NSNotificationCenter defaultCenter] removeObserver:self];