mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-20 00:57:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

(Auto)update libjingle 66406192-> 66424806

Browse source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6075 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org 2014-05-07 17:52:33 +00:00
parent 66773a032a
commit 2219037e5e
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
talk/media/webrtc/webrtcvideoengine.cc
View file

@ -81,8 +81,6 @@ void DestroyWebRtcMediaEngine(cricket::MediaEngineInterface* media_engine) {
} }
#endif #endif
static const int kVideoCodecClockratekHz = cricket::kVideoCodecClockrate / 1000;
namespace cricket { namespace cricket {
@ -232,6 +230,9 @@ class WebRtcRenderAdapter : public webrtc::ExternalRenderer {
first_frame_arrived_ = true; first_frame_arrived_ = true;
capture_start_rtp_time_stamp_ = rtp_time_stamp; capture_start_rtp_time_stamp_ = rtp_time_stamp;
} }
const int kVideoCodecClockratekHz = cricket::kVideoCodecClockrate / 1000;
#ifdef USE_WEBRTC_DEV_BRANCH #ifdef USE_WEBRTC_DEV_BRANCH
if (ntp_time_ms > 0) { if (ntp_time_ms > 0) {
uint32 elapsed_time_ms = uint32 elapsed_time_ms =