From b5a5c44ef722762d4825c9dcde06b0db2bbb79a9 Mon Sep 17 00:00:00 2001 From: "buildbot@webrtc.org" Date: Fri, 19 Sep 2014 05:36:18 +0000 Subject: [PATCH] (Auto)update libjingle 75865376-> 75875619 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7234 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/webrtc/webrtcvideoengine.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/talk/media/webrtc/webrtcvideoengine.cc b/talk/media/webrtc/webrtcvideoengine.cc index b0c6a4d39..4261ffbea 100644 --- a/talk/media/webrtc/webrtcvideoengine.cc +++ b/talk/media/webrtc/webrtcvideoengine.cc @@ -3928,6 +3928,7 @@ bool WebRtcVideoMediaChannel::MaybeResetVieSendCodec( int screencast_min_bitrate = options_.screencast_min_bitrate.GetWithDefaultIfUnset(0); bool leaky_bucket = options_.video_leaky_bucket.GetWithDefaultIfUnset(true); + StreamParams* send_params = send_channel->stream_params(); bool reset_send_codec = target_width != cur_width || target_height != cur_height; if (vie_codec.codecType == webrtc::kVideoCodecVP8) { @@ -4170,7 +4171,7 @@ bool WebRtcVideoMediaChannel::SetLimitedNumberOfSendSsrcs( std::vector ssrcs = sim_group->ssrcs; for (size_t i = 0; i < ssrcs.size() && i < limit; ++i) { - if (!SetPrimaryAndRtxSsrcs(channel_id, i, ssrcs[i], sp)) { + if (!SetPrimaryAndRtxSsrcs(channel_id, static_cast(i), ssrcs[i], sp)) { return false; } }