From 2397a17c6bd9df91ee7f2a329a6d2caba4c8cbdb Mon Sep 17 00:00:00 2001 From: "andresp@webrtc.org" Date: Mon, 27 Jan 2014 12:33:30 +0000 Subject: [PATCH] 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 --- .../source/audio_conference_mixer_impl.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 214068433d..75548a6915 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 @@ void AudioConferenceMixerImpl::UpdateToMix( mixParticipantList->erase(replaceFrame->id_); activeList.erase(replaceItem); - activeList.push_front(*replaceItem); + activeList.push_front(audioFrame); (*mixParticipantList)[audioFrame->id_] = *participant; assert(mixParticipantList->size() <= kMaximumAmountOfMixedParticipants);