| commit | a129b6cd132788a931b47da3370ae473673f320d | [log] [tgz] |
|---|---|---|
| author | wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Thu Dec 12 22:40:39 2013 +0000 |
| committer | wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Thu Dec 12 22:40:39 2013 +0000 |
| tree | 79893a9697ef37766d7761d34235b0b040364601 | |
| parent | 451745ec055314024f295487b6f34b49af2a5fcb [diff] [blame] |
Update talk to 58113193 together with https://webrtc-codereview.appspot.com/5309005/. R=mallinath@webrtc.org, niklas.enbom@webrtc.org Review URL: https://webrtc-codereview.appspot.com/5719004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5274 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/media/sctp/sctpdataengine.cc b/talk/media/sctp/sctpdataengine.cc index 2b86001..653273b 100644 --- a/talk/media/sctp/sctpdataengine.cc +++ b/talk/media/sctp/sctpdataengine.cc
@@ -542,7 +542,8 @@ } // Called by network interface when a packet has been received. -void SctpDataMediaChannel::OnPacketReceived(talk_base::Buffer* packet) { +void SctpDataMediaChannel::OnPacketReceived( + talk_base::Buffer* packet, const talk_base::PacketTime& packet_time) { LOG(LS_VERBOSE) << debug_name_ << "->OnPacketReceived(...): " << " length=" << packet->length() << ", sending: " << sending_; // Only give receiving packets to usrsctp after if connected. This enables two