author | Carsten "Tomcat" Book <cbook@mozilla.com> |
Tue, 01 Mar 2016 11:21:55 +0100 | |
changeset 286197 | e153836569007d614aa6b2260f30f0e8994e69e4 |
parent 286017 | 9da51cb4974e03cdd8fa45a34086fe1033abfeaf |
child 286247 | 8ef94be995a453f5c464278c53478ba8c8554f81 |
push id | 72696 |
push user | cbook@mozilla.com |
push date | Tue, 01 Mar 2016 14:25:42 +0000 |
treeherder | mozilla-inbound@0f47155c48a1 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
bugs | 1249313, 1207431 |
milestone | 47.0a1 |
backs out | b1b50935ab45f360774e75a4d814b2f9bf02d916 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/dom/media/webrtc/MediaEngineRemoteVideoSource.cpp +++ b/dom/media/webrtc/MediaEngineRemoteVideoSource.cpp @@ -85,16 +85,18 @@ MediaEngineRemoteVideoSource::Shutdown() } MOZ_ASSERT(mState == kStopped); } if (mState == kAllocated || mState == kStopped) { Deallocate(); } + mozilla::camera::Shutdown(); + mState = kReleased; mInitDone = false; return; } nsresult MediaEngineRemoteVideoSource::Allocate(const dom::MediaTrackConstraints& aConstraints, const MediaEnginePrefs& aPrefs,