Bug 1123012 - Just return a NULL ptr instead of casting NULL. r=jesup
authorGian-Carlo Pascutto <gpascutto@mozilla.com>
Wed, 25 Feb 2015 08:31:11 +0100
changeset 230620 b7bceb058d335bcf3d397119161876a9ddab1f10
parent 230619 7d74b74bb6ae8632a39b3e3eee588afdd7fb977b
child 230621 271171d2c620f7173d798f3a74b72277f3e2e107
push id56055
push usergpascutto@mozilla.com
push dateWed, 25 Feb 2015 07:31:29 +0000
treeherdermozilla-inbound@b7bceb058d33 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup
bugs1123012
milestone39.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1123012 - Just return a NULL ptr instead of casting NULL. r=jesup
media/webrtc/trunk/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc
--- a/media/webrtc/trunk/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc
+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc
@@ -2065,17 +2065,17 @@ bool AudioCodingImpl::RegisterSendCodec(
   if (frame_size_samples > 0) {
     codec.pacsize = frame_size_samples;
   }
   return acm_old_->RegisterSendCodec(codec) == 0;
 }
 
 const AudioEncoder* AudioCodingImpl::GetSenderInfo() const {
   FATAL() << "Not implemented yet.";
-  return reinterpret_cast<const AudioEncoder*>(NULL);
+  return NULL;
 }
 
 const CodecInst* AudioCodingImpl::GetSenderCodecInst() {
   if (acm_old_->SendCodec(&current_send_codec_) != 0) {
     return NULL;
   }
   return &current_send_codec_;
 }
@@ -2084,17 +2084,17 @@ int AudioCodingImpl::Add10MsAudio(const 
   if (acm_old_->Add10MsData(audio_frame) != 0) {
     return -1;
   }
   return acm_old_->Process();
 }
 
 const ReceiverInfo* AudioCodingImpl::GetReceiverInfo() const {
   FATAL() << "Not implemented yet.";
-  return reinterpret_cast<const ReceiverInfo*>(NULL);
+  return NULL;
 }
 
 bool AudioCodingImpl::RegisterReceiveCodec(AudioDecoder* receive_codec) {
   FATAL() << "Not implemented yet.";
   return false;
 }
 
 bool AudioCodingImpl::RegisterReceiveCodec(int decoder_type,