| Index: webrtc/voice_engine/transmit_mixer.cc
|
| diff --git a/webrtc/voice_engine/transmit_mixer.cc b/webrtc/voice_engine/transmit_mixer.cc
|
| index 14903501f6d4a99bbfcdf938ea2b5ecba7d67db8..d6a5213217e3bfe92b36a3ddbf6b4f524f6ac0f3 100644
|
| --- a/webrtc/voice_engine/transmit_mixer.cc
|
| +++ b/webrtc/voice_engine/transmit_mixer.cc
|
| @@ -10,6 +10,8 @@
|
|
|
| #include "webrtc/voice_engine/transmit_mixer.h"
|
|
|
| +#include <memory>
|
| +
|
| #include "webrtc/base/format_macros.h"
|
| #include "webrtc/base/logging.h"
|
| #include "webrtc/modules/utility/include/audio_frame_operations.h"
|
| @@ -1180,7 +1182,7 @@ int32_t TransmitMixer::RecordAudioToFile(
|
| int32_t TransmitMixer::MixOrReplaceAudioWithFile(
|
| int mixingFrequency)
|
| {
|
| - rtc::scoped_ptr<int16_t[]> fileBuffer(new int16_t[640]);
|
| + std::unique_ptr<int16_t[]> fileBuffer(new int16_t[640]);
|
|
|
| size_t fileSamples(0);
|
| {
|
|
|