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

Unified Diff: webrtc/modules/audio_coding/neteq/decoder_database.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_coding/neteq/decoder_database.cc
diff --git a/webrtc/modules/audio_coding/neteq/decoder_database.cc b/webrtc/modules/audio_coding/neteq/decoder_database.cc
index 16bec044533bc01f236f9a600d53c4c67dbd7011..8417a7662028af939a5f3cc9df68731f4d6982ec 100644
--- a/webrtc/modules/audio_coding/neteq/decoder_database.cc
+++ b/webrtc/modules/audio_coding/neteq/decoder_database.cc
@@ -214,7 +214,7 @@ const DecoderDatabase::DecoderInfo* DecoderDatabase::GetDecoderInfo(
DecoderMap::const_iterator it = decoders_.find(rtp_payload_type);
if (it == decoders_.end()) {
// Decoder not found.
- return NULL;
+ return nullptr;
}
return &it->second;
}
@@ -247,7 +247,7 @@ int DecoderDatabase::SetActiveDecoder(uint8_t rtp_payload_type,
AudioDecoder* DecoderDatabase::GetActiveDecoder() const {
if (active_decoder_type_ < 0) {
// No active decoder.
- return NULL;
+ return nullptr;
}
return GetDecoder(active_decoder_type_);
}
@@ -272,7 +272,7 @@ int DecoderDatabase::SetActiveCngDecoder(uint8_t rtp_payload_type) {
ComfortNoiseDecoder* DecoderDatabase::GetActiveCngDecoder() const {
if (active_cng_decoder_type_ < 0) {
// No active CNG decoder.
- return NULL;
+ return nullptr;
}
if (!active_cng_decoder_) {
active_cng_decoder_.reset(new ComfortNoiseDecoder);

Powered by Google App Engine
This is Rietveld 408576698