| Index: webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h
|
| diff --git a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h
|
| index 2e02448f1eaf635c10cb743c001b5503f9b30a99..14b15daad1d0b289c3f0a2cd2c21d4e6d4789bf7 100644
|
| --- a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h
|
| +++ b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h
|
| @@ -160,7 +160,7 @@ private:
|
|
|
| // The current sample frequency and sample size when mixing.
|
| Frequency _outputFrequency;
|
| - uint16_t _sampleSize;
|
| + size_t _sampleSize;
|
|
|
| // Memory pool to avoid allocating/deallocating AudioFrames
|
| MemoryPool<AudioFrame>* _audioFramePool;
|
|
|