| Index: webrtc/common_audio/resampler/resampler.cc
|
| diff --git a/webrtc/common_audio/resampler/resampler.cc b/webrtc/common_audio/resampler/resampler.cc
|
| index 7c690fc47a2bd553afa229c8f2eb426011f699ee..c91a5de9ce4be68b190ea21e08db8a50f4c0448a 100644
|
| --- a/webrtc/common_audio/resampler/resampler.cc
|
| +++ b/webrtc/common_audio/resampler/resampler.cc
|
| @@ -101,37 +101,37 @@ int Resampler::Reset(int inFreq, int outFreq, size_t num_channels)
|
| if (state1_)
|
| {
|
| free(state1_);
|
| - state1_ = NULL;
|
| + state1_ = nullptr;
|
| }
|
| if (state2_)
|
| {
|
| free(state2_);
|
| - state2_ = NULL;
|
| + state2_ = nullptr;
|
| }
|
| if (state3_)
|
| {
|
| free(state3_);
|
| - state3_ = NULL;
|
| + state3_ = nullptr;
|
| }
|
| if (in_buffer_)
|
| {
|
| free(in_buffer_);
|
| - in_buffer_ = NULL;
|
| + in_buffer_ = nullptr;
|
| }
|
| if (out_buffer_)
|
| {
|
| free(out_buffer_);
|
| - out_buffer_ = NULL;
|
| + out_buffer_ = nullptr;
|
| }
|
| if (slave_left_)
|
| {
|
| delete slave_left_;
|
| - slave_left_ = NULL;
|
| + slave_left_ = nullptr;
|
| }
|
| if (slave_right_)
|
| {
|
| delete slave_right_;
|
| - slave_right_ = NULL;
|
| + slave_right_ = nullptr;
|
| }
|
|
|
| in_buffer_size_ = 0;
|
|
|