diff --git a/modules/audio_coding/neteq/tools/packet.cc b/modules/audio_coding/neteq/tools/packet.cc index 0e7951b6e3..4e2102da2d 100644 --- a/modules/audio_coding/neteq/tools/packet.cc +++ b/modules/audio_coding/neteq/tools/packet.cc @@ -163,19 +163,7 @@ bool Packet::ParseHeader(const RtpHeaderParser& parser) { } void Packet::CopyToHeader(RTPHeader* destination) const { - destination->markerBit = header_.markerBit; - destination->payloadType = header_.payloadType; - destination->sequenceNumber = header_.sequenceNumber; - destination->timestamp = header_.timestamp; - destination->ssrc = header_.ssrc; - destination->numCSRCs = header_.numCSRCs; - destination->paddingLength = header_.paddingLength; - destination->headerLength = header_.headerLength; - destination->payload_type_frequency = header_.payload_type_frequency; - memcpy(&destination->arrOfCSRCs, &header_.arrOfCSRCs, - sizeof(header_.arrOfCSRCs)); - memcpy(&destination->extension, &header_.extension, - sizeof(header_.extension)); + *destination = header_; } } // namespace test diff --git a/modules/rtp_rtcp/source/rtp_header_parser.cc b/modules/rtp_rtcp/source/rtp_header_parser.cc index 1d937f80bd..65431d1397 100644 --- a/modules/rtp_rtcp/source/rtp_header_parser.cc +++ b/modules/rtp_rtcp/source/rtp_header_parser.cc @@ -64,7 +64,7 @@ bool RtpHeaderParserImpl::Parse(const uint8_t* packet, size_t length, RTPHeader* header) const { RtpUtility::RtpHeaderParser rtp_parser(packet, length); - memset(header, 0, sizeof(*header)); + *header = RTPHeader(); RtpHeaderExtensionMap map; {