| Index: talk/media/base/codec.cc
|
| diff --git a/talk/media/base/codec.cc b/talk/media/base/codec.cc
|
| index 5fbae2c45e68990f2762a7f20bf32c633ab25505..4f360aa63b158df0177dc9ce5af67a0b37afe464 100644
|
| --- a/talk/media/base/codec.cc
|
| +++ b/talk/media/base/codec.cc
|
| @@ -163,13 +163,15 @@ void Codec::IntersectFeedbackParams(const Codec& other) {
|
| feedback_params.Intersect(other.feedback_params);
|
| }
|
|
|
| -AudioCodec::AudioCodec(int pt,
|
| - const std::string& nm,
|
| - int cr,
|
| - int br,
|
| - int cs,
|
| - int pr)
|
| - : Codec(pt, nm, cr, pr), bitrate(br), channels(cs) {
|
| +AudioCodec::AudioCodec(int id,
|
| + const std::string& name,
|
| + int clockrate,
|
| + int bitrate,
|
| + int channels,
|
| + int preference)
|
| + : Codec(id, name, clockrate, preference),
|
| + bitrate(bitrate),
|
| + channels(channels) {
|
| }
|
|
|
| AudioCodec::AudioCodec() : Codec(), bitrate(0), channels(0) {
|
|
|