Filter overlapping RTP header extensions.

talk/media/webrtc/webrtcvideoengine2.cc

Index: talk/media/webrtc/webrtcvideoengine2.cc
diff --git a/talk/media/webrtc/webrtcvideoengine2.cc b/talk/media/webrtc/webrtcvideoengine2.cc
index ed75c0d427a1f54b26084790bcea8446264d6731..a6055a1d593150de9709e7499b9ba6de8443c0e2 100644
--- a/talk/media/webrtc/webrtcvideoengine2.cc
+++ b/talk/media/webrtc/webrtcvideoengine2.cc
@@ -36,6 +36,7 @@
 #include "talk/media/base/videorenderer.h"
 #include "talk/media/webrtc/constants.h"
 #include "talk/media/webrtc/simulcast.h"
+#include "talk/media/webrtc/webrtcmediaengine.h"
 #include "talk/media/webrtc/webrtcvideoencoderfactory.h"
 #include "talk/media/webrtc/webrtcvideoframe.h"
 #include "talk/media/webrtc/webrtcvoiceengine.h"
@@ -1543,8 +1544,8 @@ bool WebRtcVideoChannel2::SetSendRtpHeaderExtensions(
   if (!ValidateRtpHeaderExtensionIds(extensions))
     return false;
 
-  std::vector<webrtc::RtpExtension> filtered_extensions =
-      FilterRtpExtensions(extensions);
+  std::vector<webrtc::RtpExtension> filtered_extensions = FilterRtpExtensions(
+      FilterOverlappingRtpExtensions(extensions, kBweExtensionPriorities));
   if (!RtpExtensionsHaveChanged(send_rtp_extensions_, filtered_extensions)) {
     LOG(LS_INFO) << "Ignoring call to SetSendRtpHeaderExtensions because "
                     "header extensions haven't changed.";