| commit | 2397a17c6bd9df91ee7f2a329a6d2caba4c8cbdb | [log] [tgz] |
|---|---|---|
| author | andresp@webrtc.org <andresp@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Mon Jan 27 12:33:30 2014 |
| committer | andresp@webrtc.org <andresp@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Mon Jan 27 12:33:30 2014 |
| tree | 59b106986931ea52ed0c8cd7a97891bf05785790 | |
| parent | c8b99a49d13fea49acb4948d73ec59a94168f446 [diff] |
Fix bug introduced during replace of list wrapper with std equivalents in r5378. 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
diff --git a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc index 2140684..75548a6 100644 --- a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc +++ b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc
@@ -697,7 +697,7 @@ mixParticipantList->erase(replaceFrame->id_); activeList.erase(replaceItem); - activeList.push_front(*replaceItem); + activeList.push_front(audioFrame); (*mixParticipantList)[audioFrame->id_] = *participant; assert(mixParticipantList->size() <= kMaximumAmountOfMixedParticipants);