From c0cde560f2c077dbf77641f8cf6c9493ca10730e Mon Sep 17 00:00:00 2001 From: Steve Anton Date: Mon, 21 Aug 2017 09:18:26 -0700 Subject: [PATCH] Fix size_t to int in RtpDemuxer. Addresses build failures in Chrome. Bug: 756840 Change-Id: Icfb3b230f05a99d7f29d913180ed6d2601c26f4d Reviewed-on: https://chromium-review.googlesource.com/623949 Commit-Queue: Niklas Enbom Reviewed-by: Niklas Enbom Reviewed-by: Henrik Kjellander Cr-Commit-Position: refs/heads/master@{#19435} --- webrtc/call/rtp_demuxer.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/webrtc/call/rtp_demuxer.cc b/webrtc/call/rtp_demuxer.cc index 7c7970d7f1..1939a0fe6a 100644 --- a/webrtc/call/rtp_demuxer.cc +++ b/webrtc/call/rtp_demuxer.cc @@ -142,11 +142,11 @@ void RtpDemuxer::AddSink(const std::string& rsid, bool RtpDemuxer::RemoveSink(const RtpPacketSinkInterface* sink) { RTC_DCHECK(sink); - int num_removed = RemoveFromMapByValue(&sink_by_mid_, sink) + - RemoveFromMapByValue(&sink_by_ssrc_, sink) + - RemoveFromMultimapByValue(&sinks_by_pt_, sink) + - RemoveFromMapByValue(&sink_by_mid_and_rsid_, sink) + - RemoveFromMapByValue(&sink_by_rsid_, sink); + size_t num_removed = RemoveFromMapByValue(&sink_by_mid_, sink) + + RemoveFromMapByValue(&sink_by_ssrc_, sink) + + RemoveFromMultimapByValue(&sinks_by_pt_, sink) + + RemoveFromMapByValue(&sink_by_mid_and_rsid_, sink) + + RemoveFromMapByValue(&sink_by_rsid_, sink); RefreshKnownMids(); return num_removed > 0; }