Bug 1363563: remove and erase existing header extensions. r?mjf draft
authorNils Ohlmeier [:drno] <drno@ohlmeier.org>
Wed, 10 May 2017 16:19:40 -0700
changeset 575999 8035de27a75220d554a374db490bac352e30be69
parent 575998 73188f1a7d1eb1fa62f01ae02facd8c806ca9b77
child 628078 fc43ac38380b33571361eb3d1b67f0fb24df300f
push id58232
push userdrno@ohlmeier.org
push dateThu, 11 May 2017 06:22:03 +0000
reviewersmjf
bugs1363563
milestone55.0a1
Bug 1363563: remove and erase existing header extensions. r?mjf MozReview-Commit-ID: IzVEaOhLNwR
media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
--- a/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
+++ b/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
@@ -249,19 +249,23 @@ WebrtcVideoConduit::~WebrtcVideoConduit(
 }
 
 void
 WebrtcVideoConduit::AddLocalRTPExtensions(bool aIsSend,
   const std::vector<webrtc::RtpExtension> & aExtensions)
 {
   auto& extList = aIsSend ? mSendStreamConfig.rtp.extensions :
                   mRecvStreamConfig.rtp.extensions;
-  std::remove_if(extList.begin(), extList.end(), [&](const webrtc::RtpExtension & i) {
-    return std::find(aExtensions.begin(), aExtensions.end(),i) != aExtensions.end();
-  });
+  extList.erase(std::remove_if(extList.begin(),
+                               extList.end(),
+                               [&](const webrtc::RtpExtension & i) {
+                                 return std::find(aExtensions.begin(),
+                                                  aExtensions.end(),
+                                                  i) != aExtensions.end(); }),
+                extList.end());
   extList.insert(extList.end(), aExtensions.begin(), aExtensions.end());
 }
 
 std::vector<webrtc::RtpExtension>
 WebrtcVideoConduit::GetLocalRTPExtensions(bool aIsSend) const
 {
   return aIsSend ? mSendStreamConfig.rtp.extensions : mRecvStreamConfig.rtp.extensions;
 }