Bug 1123012 - Just return a NULL ptr instead of casting NULL. r=jesup, a=lsblakk
authorGian-Carlo Pascutto <gpascutto@mozilla.com>
Wed, 25 Feb 2015 08:31:11 +0100
changeset 247827 256f560409edd6a4c1aba13d7f5bacecb03a433d
parent 247826 ac0ad76096ad4d93b1d62a0f55ae13b1b3bd74f6
child 247828 8a0d1a42bb4c04d308a3c5bf73652e92041c1d6e
push id7690
push userryanvm@gmail.com
push dateFri, 27 Feb 2015 22:27:33 +0000
treeherdermozilla-aurora@40d995020286 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup, lsblakk
bugs1123012
milestone38.0a2
Bug 1123012 - Just return a NULL ptr instead of casting NULL. r=jesup, a=lsblakk
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
@@ -2067,17 +2067,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_;
 }
@@ -2086,17 +2086,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,