diff options
| author | buildbot@webrtc.org <buildbot@webrtc.org> | 2014-09-19 05:36:18 +0000 |
|---|---|---|
| committer | buildbot@webrtc.org <buildbot@webrtc.org> | 2014-09-19 05:36:18 +0000 |
| commit | b25f2cd3bd9b8444d2a1d48ca26e2721b42c78e1 (patch) | |
| tree | d668eab880ff63a44a337bf6d66f3695c3e263b0 | |
| parent | 7aa6baa9a213c4ca2d51a8d2d3b4bbc46a695ca7 (diff) | |
| download | talk-b25f2cd3bd9b8444d2a1d48ca26e2721b42c78e1.tar.gz | |
(Auto)update libjingle 75865376-> 75875619
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@7234 4adac7df-926f-26a2-2b94-8c16560cd09d
| -rw-r--r-- | media/webrtc/webrtcvideoengine.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/webrtc/webrtcvideoengine.cc b/media/webrtc/webrtcvideoengine.cc index b0c6a4d..4261ffb 100644 --- a/media/webrtc/webrtcvideoengine.cc +++ b/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<uint32> 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<int>(i), ssrcs[i], sp)) { return false; } } |