| Index: webrtc/modules/audio_mixer/audio_mixer_defines.h
|
| diff --git a/webrtc/modules/audio_mixer/audio_mixer_defines.h b/webrtc/modules/audio_mixer/audio_mixer_defines.h
|
| index 7f69a4347ad329f199d6325697948dc3773a05a1..b8d7234cf7e6b1d257c7a372065b4839bade705d 100644
|
| --- a/webrtc/modules/audio_mixer/audio_mixer_defines.h
|
| +++ b/webrtc/modules/audio_mixer/audio_mixer_defines.h
|
| @@ -46,7 +46,7 @@ class MixerAudioSource {
|
| // Returns true if the participant was mixed this mix iteration.
|
| bool IsMixed() const;
|
|
|
| - NewMixHistory* _mixHistory;
|
| + NewMixHistory* mix_history_;
|
|
|
| protected:
|
| MixerAudioSource();
|
|
|