| Index: webrtc/media/base/codec.cc
|
| diff --git a/webrtc/media/base/codec.cc b/webrtc/media/base/codec.cc
|
| index 0320e58c722a9245661c257af27de37159318044..aac21002b60a2b876a1a7c0558a640fbeaa19adb 100644
|
| --- a/webrtc/media/base/codec.cc
|
| +++ b/webrtc/media/base/codec.cc
|
| @@ -13,7 +13,7 @@
|
| #include <algorithm>
|
| #include <sstream>
|
|
|
| -#include "webrtc/base/common.h"
|
| +#include "webrtc/base/checks.h"
|
| #include "webrtc/base/logging.h"
|
| #include "webrtc/base/stringencode.h"
|
| #include "webrtc/base/stringutils.h"
|
| @@ -54,7 +54,7 @@
|
| return;
|
| }
|
| params_.push_back(param);
|
| - ASSERT(!HasDuplicateEntries());
|
| + RTC_CHECK(!HasDuplicateEntries());
|
| }
|
|
|
| void FeedbackParams::Intersect(const FeedbackParams& from) {
|
| @@ -192,7 +192,7 @@
|
|
|
| webrtc::RtpCodecParameters AudioCodec::ToCodecParameters() const {
|
| webrtc::RtpCodecParameters codec_params = Codec::ToCodecParameters();
|
| - codec_params.channels = channels;
|
| + codec_params.channels = static_cast<int>(channels);
|
| return codec_params;
|
| }
|
|
|
|
|