| Index: webrtc/video/video_capture_input.cc
|
| diff --git a/webrtc/video/video_capture_input.cc b/webrtc/video/video_capture_input.cc
|
| index 7e881eb5b8d47c12b1b3b930ed4cd88e184ce3a3..1f416490aec610f181a3a522ddaab66c9140a507 100644
|
| --- a/webrtc/video/video_capture_input.cc
|
| +++ b/webrtc/video/video_capture_input.cc
|
| @@ -46,6 +46,7 @@
|
| this,
|
| "EncoderThread")),
|
| capture_event_(EventWrapper::Create()),
|
| + stop_(0),
|
| last_captured_timestamp_(0),
|
| delta_ntp_internal_ms_(
|
| Clock::GetRealTimeClock()->CurrentNtpInMilliseconds() -
|
| @@ -64,7 +65,7 @@
|
| module_process_thread_->DeRegisterModule(overuse_detector_.get());
|
|
|
| // Stop the thread.
|
| - rtc::AtomicInt::ReleaseStore(&stop_, 1);
|
| + rtc::AtomicOps::ReleaseStore(&stop_, 1);
|
| capture_event_->Set();
|
| encoder_thread_->Stop();
|
| }
|
| @@ -128,7 +129,7 @@
|
| static const int kThreadWaitTimeMs = 100;
|
| int64_t capture_time = -1;
|
| if (capture_event_->Wait(kThreadWaitTimeMs) == kEventSignaled) {
|
| - if (rtc::AtomicInt::AcquireLoad(&stop_))
|
| + if (rtc::AtomicOps::AcquireLoad(&stop_))
|
| return false;
|
|
|
| int64_t encode_start_time = -1;
|
|
|