Merge branch 'master' into revert-794-install-quic

Author: jianjunz

scripts/patches/licode/0021-Allow-SDP-info-re-init.patch

@@ -1,22 +1,20 @@
-From 7e4adc0f7898925ee37dfd19da21aed5d854b38e Mon Sep 17 00:00:00 2001
+From 50f135d22519037408e4fbd64ae8615e2d6d8379 Mon Sep 17 00:00:00 2001
 From: Chen Li1 <[email protected]>
 Date: Tue, 22 Dec 2020 16:55:51 +0800
 Subject: [PATCH] Allow SDP info re-init
 
 ---
- erizo/src/erizo/SdpInfo.cpp | 10 ++++++++++
- 1 file changed, 10 insertions(+)
+ erizo/src/erizo/SdpInfo.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
 
 diff --git a/erizo/src/erizo/SdpInfo.cpp b/erizo/src/erizo/SdpInfo.cpp
-index 4e13951..6b23522 100644
+index 4e139511..393e48a8 100644
 --- a/erizo/src/erizo/SdpInfo.cpp
 +++ b/erizo/src/erizo/SdpInfo.cpp
-@@ -69,7 +69,17 @@ namespace erizo {
+@@ -69,7 +69,15 @@ namespace erizo {
    }
 
    bool SdpInfo::initWithSdp(const std::string& sdp, const std::string& media) {
-+    inOutPTMap.clear();
-+    outInPTMap.clear();
 +    payloadVector.clear();
 +    bundleTags.clear();
 +    extMapVector.clear();
@@ -30,5 +28,5 @@ index 4e13951..6b23522 100644
    }
    std::string SdpInfo::addCandidate(const CandidateInfo& info) {
 -- 
-2.7.4
+2.17.1