From 1fd5b45a0eb1359fa829a0d4cf93c48d47f3e519 Mon Sep 17 00:00:00 2001 From: "buildbot@webrtc.org" Date: Tue, 15 Apr 2014 17:39:43 +0000 Subject: [PATCH] (Auto)update libjingle 64956819-> 64982143 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5910 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/webrtc/webrtcvideoengine.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/talk/media/webrtc/webrtcvideoengine.cc b/talk/media/webrtc/webrtcvideoengine.cc index 42d416c260..4762c57dca 100644 --- a/talk/media/webrtc/webrtcvideoengine.cc +++ b/talk/media/webrtc/webrtcvideoengine.cc @@ -281,8 +281,13 @@ class WebRtcRenderAdapter : public webrtc::ExternalRenderer { return renderer_->SetSize(width_, height_, 0) ? 0 : -1; } - virtual int DeliverFrame(unsigned char* buffer, int buffer_size, - uint32_t time_stamp, int64_t render_time, + virtual int DeliverFrame(unsigned char* buffer, + int buffer_size, + uint32_t time_stamp, +#ifdef USE_WEBRTC_DEV_BRANCH + int64_t ntp_time_ms, +#endif + int64_t render_time, void* handle) { talk_base::CritScope cs(&crit_); frame_rate_tracker_.Update(1);