| Index: webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc
|
| diff --git a/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc b/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc
|
| index 9f97c79a8a40fb5ddcc77b2f4a4bffe8f0078bd6..01d41221b96feff5ddeb1939f22d657bddce2986 100644
|
| --- a/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc
|
| +++ b/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc
|
| @@ -84,7 +84,7 @@ const CodecInst ACMCodecDB::database_[] = {
|
| {127, "red", 8000, 0, 1, 0},
|
| #endif
|
| // To prevent compile errors due to trailing commas.
|
| - {-1, "Null", -1, -1, -1, -1}
|
| + {-1, "Null", -1, -1, 0, -1}
|
| };
|
|
|
| // Create database with all codec settings at compile time.
|
| @@ -145,7 +145,7 @@ const ACMCodecDB::CodecSettings ACMCodecDB::codec_settings_[] = {
|
| {1, {0}, 0, 1, false},
|
| #endif
|
| // To prevent compile errors due to trailing commas.
|
| - {-1, {-1}, -1, -1, false}
|
| + {-1, {-1}, -1, 0, false}
|
| };
|
|
|
| // Create a database of all NetEQ decoders at compile time.
|
| @@ -312,7 +312,9 @@ int ACMCodecDB::CodecId(const CodecInst& codec_inst) {
|
| codec_inst.channels));
|
| }
|
|
|
| -int ACMCodecDB::CodecId(const char* payload_name, int frequency, int channels) {
|
| +int ACMCodecDB::CodecId(const char* payload_name,
|
| + int frequency,
|
| + size_t channels) {
|
| for (int id = 0; id < kNumCodecs; id++) {
|
| bool name_match = false;
|
| bool frequency_match = false;
|
|
|