| Index: talk/session/media/channel.cc
|
| diff --git a/talk/session/media/channel.cc b/talk/session/media/channel.cc
|
| index fb0f5742115e7c530fc656297933ce95f61eb099..c0f7f23f33ee576913f6b477830f0765888e60e3 100644
|
| --- a/talk/session/media/channel.cc
|
| +++ b/talk/session/media/channel.cc
|
| @@ -1497,9 +1497,6 @@ bool VoiceChannel::SetRemoteContent_w(const MediaContentDescription* content,
|
|
|
| AudioSendParameters send_params = last_send_params_;
|
| RtpSendParametersFromMediaDescription(audio, &send_params);
|
| - if (audio->conference_mode()) {
|
| - send_params.options.conference_mode.Set(true);
|
| - }
|
| if (audio->agc_minus_10db()) {
|
| send_params.options.adjust_agc_delta.Set(kAgcMinus10db);
|
| }
|
|
|