Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(956)

Unified Diff: webrtc/modules/audio_mixer/audio_mixer_impl.cc

Issue 2685783014: Replace NULL with nullptr in all C++ files. (Closed)
Patch Set: Fixing android. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/audio_mixer/audio_mixer_impl.cc
diff --git a/webrtc/modules/audio_mixer/audio_mixer_impl.cc b/webrtc/modules/audio_mixer/audio_mixer_impl.cc
index 3da1be227071da85ea62b08f4ec3cdf3611286e5..e7c63d8778a19ee1622c7e5b52d657b54f539920 100644
--- a/webrtc/modules/audio_mixer/audio_mixer_impl.cc
+++ b/webrtc/modules/audio_mixer/audio_mixer_impl.cc
@@ -220,8 +220,8 @@ void AudioMixerImpl::Mix(size_t number_of_channels,
}
audio_frame_for_mixing->UpdateFrame(
- -1, time_stamp_, NULL, 0, OutputFrequency(), AudioFrame::kNormalSpeech,
- AudioFrame::kVadPassive, number_of_channels);
+ -1, time_stamp_, nullptr, 0, OutputFrequency(),
+ AudioFrame::kNormalSpeech, AudioFrame::kVadPassive, number_of_channels);
time_stamp_ += static_cast<uint32_t>(sample_size_);

Powered by Google App Engine
This is Rietveld 408576698