Merge 8281e66 into 1a6d94a

ossrs · Apr 7, 2022 · 6a06989 · 6a06989
2 parents 1a6d94a + 8281e66
commit 6a06989
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/trunk/src/app/srs_app_edge.cpp b/trunk/src/app/srs_app_edge.cpp
@@ -631,12 +631,8 @@ srs_error_t SrsEdgeIngester::process_publish_message(SrsCommonMessage* msg, stri
         SrsAutoFree(SrsPacket, pkt);
 
         // RTMP 302 redirect
-        if (dynamic_cast<SrsCallPacket*>(pkt)) {
-            SrsCallPacket* call = dynamic_cast<SrsCallPacket*>(pkt);
-            if (!call->arguments->is_object()) {
-                return err;
-            }
-
+        SrsCallPacket* call = dynamic_cast<SrsCallPacket*>(pkt);
+        if (call && call->arguments && call->arguments->is_object()) {
             SrsAmf0Any* prop = NULL;
             SrsAmf0Object* evt = call->arguments->to_object();
 

diff --git a/trunk/src/app/srs_app_threads.cpp b/trunk/src/app/srs_app_threads.cpp
@@ -33,18 +33,12 @@ extern SrsStageManager* _srs_stages;
 
 #ifdef SRS_RTC
 extern SrsRtcBlackhole* _srs_blackhole;
-extern SrsResourceManager* _srs_rtc_manager;
-
 extern SrsResourceManager* _srs_rtc_manager;
 extern SrsDtlsCertificate* _srs_rtc_dtls_certificate;
 #endif
 
 #include <srs_protocol_kbps.hpp>
 
-extern SrsPps* _srs_pps_snack2;
-extern SrsPps* _srs_pps_snack3;
-extern SrsPps* _srs_pps_snack4;
-
 SrsPps* _srs_pps_aloss2 = NULL;
 
 extern SrsPps* _srs_pps_ids;
@@ -137,8 +131,6 @@ extern SrsPps* _srs_pps_rstuns;
 extern SrsPps* _srs_pps_rrtps;
 extern SrsPps* _srs_pps_rrtcps;
 
-extern SrsPps* _srs_pps_aloss2;
-
 extern SrsPps* _srs_pps_cids_get;
 extern SrsPps* _srs_pps_cids_set;