generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bug introduced during replace of list wrapper with std equivalents in r5378.

Browse Source 
R=henrika@webrtc.org, pbos@webrtc.org, henrike@webrtc.org
TBR=henrike@webrtc.org
BUG=2164

Review URL: https://webrtc-codereview.appspot.com/7639004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5437 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andresp@webrtc.org
2014-01-27 12:33:30 +00:00
parent c8b99a49d1
commit 2397a17c6b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc
View File

@@ -697,7 +697,7 @@ void AudioConferenceMixerImpl::UpdateToMix(
mixParticipantList->erase(replaceFrame->id_); mixParticipantList->erase(replaceFrame->id_);
activeList.erase(replaceItem); activeList.erase(replaceItem);
activeList.push_front(*replaceItem); activeList.push_front(audioFrame);
(*mixParticipantList)[audioFrame->id_] = *participant; (*mixParticipantList)[audioFrame->id_] = *participant;
assert(mixParticipantList->size() <= assert(mixParticipantList->size() <=
kMaximumAmountOfMixedParticipants); kMaximumAmountOfMixedParticipants);