diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
| commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
| tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/third_party/webrtc/video_engine/vie_rtp_rtcp_impl.cc | |
| parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/third_party/webrtc/video_engine/vie_rtp_rtcp_impl.cc')
| -rw-r--r-- | chromium/third_party/webrtc/video_engine/vie_rtp_rtcp_impl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/third_party/webrtc/video_engine/vie_rtp_rtcp_impl.cc b/chromium/third_party/webrtc/video_engine/vie_rtp_rtcp_impl.cc index d8ead1278d4..ecfa1b669f5 100644 --- a/chromium/third_party/webrtc/video_engine/vie_rtp_rtcp_impl.cc +++ b/chromium/third_party/webrtc/video_engine/vie_rtp_rtcp_impl.cc @@ -501,7 +501,7 @@ int ViERTP_RTCPImpl::SetNACKStatus(const int video_channel, const bool enable) { shared_data_->SetLastError(kViERtpRtcpUnknownError); return -1; } - vie_encoder->UpdateProtectionMethod(); + vie_encoder->UpdateProtectionMethod(enable); return 0; } @@ -542,7 +542,7 @@ int ViERTP_RTCPImpl::SetFECStatus(const int video_channel, const bool enable, shared_data_->SetLastError(kViERtpRtcpUnknownError); return -1; } - vie_encoder->UpdateProtectionMethod(); + vie_encoder->UpdateProtectionMethod(false); return 0; } @@ -587,7 +587,7 @@ int ViERTP_RTCPImpl::SetHybridNACKFECStatus( shared_data_->SetLastError(kViERtpRtcpUnknownError); return -1; } - vie_encoder->UpdateProtectionMethod(); + vie_encoder->UpdateProtectionMethod(enable); return 0; } |