From 4888fd48272dc7fde24b21a3a7dfefdc9b4e9466 Mon Sep 17 00:00:00 2001 From: "elham@webrtc.org" Date: Mon, 15 Jul 2013 21:21:48 +0000 Subject: [PATCH] Revert r4321 "Fix uninitialized value warning in rtp_payload_registry and make sure we return an error if the payload type isn't registered" R=pwestin@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1790006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4345 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc | 1 - webrtc/voice_engine/channel.cc | 3 --- 2 files changed, 4 deletions(-) diff --git a/webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc b/webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc index 95e6bdc244..db56d789ec 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc @@ -103,7 +103,6 @@ int32_t RTPPayloadRegistry::RegisterReceivePayload( if (ModuleRTPUtility::StringCompare(payload_name, "red", 3)) { red_payload_type_ = payload_type; payload = new ModuleRTPUtility::Payload; - memset(payload, 0, sizeof(*payload)); payload->audio = false; payload->name[RTP_PAYLOAD_NAME_SIZE - 1] = 0; strncpy(payload->name, payload_name, RTP_PAYLOAD_NAME_SIZE - 1); diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc index 3c0dd929ef..9a59a07fe4 100644 --- a/webrtc/voice_engine/channel.cc +++ b/webrtc/voice_engine/channel.cc @@ -2184,9 +2184,6 @@ int32_t Channel::ReceivedRTPPacket(const int8_t* data, int32_t length) { } header.payload_type_frequency = rtp_payload_registry_->GetPayloadTypeFrequency(header.payloadType); - if (header.payload_type_frequency < 0) { - return -1; - } bool retransmitted = IsPacketRetransmitted(header); bool in_order = rtp_receiver_->InOrderPacket(header.sequenceNumber); rtp_receive_statistics_->IncomingPacket(header, static_cast(length),