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); |