From 376b4ea93f439d85754c081650710ce1265d9cd4 Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Tue, 15 Jul 2014 15:51:33 +0000 Subject: [PATCH] Fix breakage introduced by r6691. ModuleRtpRtcpImpl returned incorrectly on RemoteNTP as the RTCPReceiver::NTP changed return type. BUG= TBR=stefan@webrtc.org Review URL: https://webrtc-codereview.appspot.com/18799004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6693 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc index 1fb0c5d271..a26b36a5e2 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc @@ -765,7 +765,9 @@ int32_t ModuleRtpRtcpImpl::RemoteNTP( received_ntpfrac, rtcp_arrival_time_secs, rtcp_arrival_time_frac, - rtcp_timestamp); + rtcp_timestamp) + ? 0 + : -1; } // Get RoundTripTime.