| Index: webrtc/media/base/codec.cc
 | 
| diff --git a/webrtc/media/base/codec.cc b/webrtc/media/base/codec.cc
 | 
| index 93cd4f3dafe87ea7fbfece0ca9b527ad5edf74db..835cf77b3e77a87e3e31e7df747e09300cbd363b 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 @@ void FeedbackParams::Add(const FeedbackParam& param) {
 | 
|      return;
 | 
|    }
 | 
|    params_.push_back(param);
 | 
| -  ASSERT(!HasDuplicateEntries());
 | 
| +  RTC_CHECK(!HasDuplicateEntries());
 | 
|  }
 | 
|  
 | 
|  void FeedbackParams::Intersect(const FeedbackParams& from) {
 | 
| @@ -192,7 +192,7 @@ bool AudioCodec::Matches(const AudioCodec& codec) const {
 | 
|  
 | 
|  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;
 | 
|  }
 | 
|  
 | 
| 
 |