summaryrefslogtreecommitdiffstats
path: root/media/video
diff options
context:
space:
mode:
authorwjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-21 23:12:59 +0000
committerwjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-21 23:12:59 +0000
commit0991fa9f11722cc5d0959476668904aaa0f2b9c7 (patch)
tree3376158a35b965420b0953ae837d88b11e3a85a7 /media/video
parent7cf67b5833bb46ab2b19a44b11e59954669de479 (diff)
downloadchromium_src-0991fa9f11722cc5d0959476668904aaa0f2b9c7.zip
chromium_src-0991fa9f11722cc5d0959476668904aaa0f2b9c7.tar.gz
chromium_src-0991fa9f11722cc5d0959476668904aaa0f2b9c7.tar.bz2
clear QTCaptureDecompressedVideoOutput's delegate when CaptureSession is released.
When CaptureSession is released, it's needed to remove it as QTCaptureDecompressedVideoOutput's delegate. BUG=138326 Review URL: https://chromiumcodereview.appspot.com/10827458 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152665 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/video')
-rw-r--r--media/video/capture/mac/video_capture_device_qtkit_mac.mm2
1 files changed, 2 insertions, 0 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 67cddfd..c70e84b 100644
--- a/media/video/capture/mac/video_capture_device_qtkit_mac.mm
+++ b/media/video/capture/mac/video_capture_device_qtkit_mac.mm
@@ -91,6 +91,8 @@
// The device is still running.
[self stopCapture];
}
+ [[[captureSession_ outputs] objectAtIndex:0] setDelegate:nil];
+ [captureSession_ removeOutput:[[captureSession_ outputs] objectAtIndex:0]];
[captureSession_ release];
captureSession_ = nil;
[captureDeviceInput_ release];