| Index: talk/media/base/videoadapter.cc
|
| diff --git a/talk/media/base/videoadapter.cc b/talk/media/base/videoadapter.cc
|
| index 5a2d7b4bce82d80ae399fe1d5fdc906b1bf7632d..edeed637221b04ebd6cf6fc74a36b9338c4c7235 100644
|
| --- a/talk/media/base/videoadapter.cc
|
| +++ b/talk/media/base/videoadapter.cc
|
| @@ -182,7 +182,7 @@ VideoAdapter::~VideoAdapter() {
|
|
|
| void VideoAdapter::SetInputFormat(const VideoFormat& format) {
|
| rtc::CritScope cs(&critical_section_);
|
| - int64 old_input_interval = input_format_.interval;
|
| + int64_t old_input_interval = input_format_.interval;
|
| input_format_ = format;
|
| output_format_.interval =
|
| std::max(output_format_.interval, input_format_.interval);
|
| @@ -223,7 +223,7 @@ void CoordinatedVideoAdapter::set_cpu_smoothing(bool enable) {
|
|
|
| void VideoAdapter::SetOutputFormat(const VideoFormat& format) {
|
| rtc::CritScope cs(&critical_section_);
|
| - int64 old_output_interval = output_format_.interval;
|
| + int64_t old_output_interval = output_format_.interval;
|
| output_format_ = format;
|
| output_num_pixels_ = output_format_.width * output_format_.height;
|
| output_format_.interval =
|
|
|