| Index: trunk/src/media/video/capture/mac/video_capture_device_qtkit_mac.mm
|
| ===================================================================
|
| --- trunk/src/media/video/capture/mac/video_capture_device_qtkit_mac.mm (revision 243443)
|
| +++ trunk/src/media/video/capture/mac/video_capture_device_qtkit_mac.mm (working copy)
|
| @@ -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_ removeInput:captureDeviceInput_];
|
| [captureSession_ stopRunning];
|
| - [captureSession_ removeInput:captureDeviceInput_];
|
| }
|
|
|
| [[NSNotificationCenter defaultCenter] removeObserver:self];
|
|
|