From 376be6c904dd540a47d76e988d7c0c7af3c827ef Mon Sep 17 00:00:00 2001 From: "leozwang@webrtc.org" Date: Mon, 23 Jan 2012 16:46:38 +0000 Subject: [PATCH] Fix compilation error Review URL: https://webrtc-codereview.appspot.com/358005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1508 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/modules/rtp_rtcp/source/Android.mk | 6 +++++- src/modules/rtp_rtcp/source/rtp_packet_history.cc | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/modules/rtp_rtcp/source/Android.mk b/src/modules/rtp_rtcp/source/Android.mk index 00bd02a88..68295be7a 100644 --- a/src/modules/rtp_rtcp/source/Android.mk +++ b/src/modules/rtp_rtcp/source/Android.mk @@ -27,6 +27,7 @@ LOCAL_SRC_FILES := \ rtp_receiver.cc \ rtp_sender.cc \ rtp_utility.cc \ + rtp_header_extension.cc \ ssrc_database.cc \ tmmbr_help.cc \ dtmf_queue.cc \ @@ -37,10 +38,13 @@ LOCAL_SRC_FILES := \ forward_error_correction_internal.cc \ overuse_detector.cc \ remote_rate_control.cc \ + rtp_packet_history.cc \ receiver_fec.cc \ rtp_receiver_video.cc \ rtp_sender_video.cc \ - rtp_format_vp8.cc + rtp_format_vp8.cc \ + transmission_bucket.cc \ + vp8_partition_aggregator.cc # Flags passed to both C and C++ files. LOCAL_CFLAGS := \ diff --git a/src/modules/rtp_rtcp/source/rtp_packet_history.cc b/src/modules/rtp_rtcp/source/rtp_packet_history.cc index a118162db..0de75532d 100644 --- a/src/modules/rtp_rtcp/source/rtp_packet_history.cc +++ b/src/modules/rtp_rtcp/source/rtp_packet_history.cc @@ -138,7 +138,7 @@ int32_t RTPPacketHistory::PutRTPPacket(const uint8_t* packet, // Store packet std::vector >::iterator it = stored_packets_.begin() + prev_index_; - copy(packet, packet + packet_length, it->begin()); + std::copy(packet, packet + packet_length, it->begin()); stored_seq_nums_[prev_index_] = seq_num; stored_lengths_[prev_index_] = packet_length; @@ -218,7 +218,7 @@ bool RTPPacketHistory::GetRTPPacket(uint16_t sequence_number, // Get packet. std::vector >::const_iterator it_found_packet = stored_packets_.begin() + index; - copy(it_found_packet->begin(), it_found_packet->begin() + length, packet); + std::copy(it_found_packet->begin(), it_found_packet->begin() + length, packet); *packet_length = stored_lengths_.at(index); *stored_time_ms = stored_times_.at(index); *type = stored_types_.at(index);