From 49853d2b8a9b2de3adcd6bc2d48a965e7185066d Mon Sep 17 00:00:00 2001 From: xubin Date: Fri, 2 Sep 2016 15:10:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dforward=E5=B4=A9=E6=BA=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- trunk/src/app/srs_app_forward.cpp | 2 -- trunk/src/app/srs_app_st.cpp | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) mode change 100644 => 100755 trunk/src/app/srs_app_forward.cpp mode change 100644 => 100755 trunk/src/app/srs_app_st.cpp diff --git a/trunk/src/app/srs_app_forward.cpp b/trunk/src/app/srs_app_forward.cpp old mode 100644 new mode 100755 index 572c2ee23..9fd95fac3 --- a/trunk/src/app/srs_app_forward.cpp +++ b/trunk/src/app/srs_app_forward.cpp @@ -68,8 +68,6 @@ SrsForwarder::SrsForwarder(SrsSource* _source) SrsForwarder::~SrsForwarder() { - on_unpublish(); - srs_freep(pthread); srs_freep(queue); srs_freep(jitter); diff --git a/trunk/src/app/srs_app_st.cpp b/trunk/src/app/srs_app_st.cpp old mode 100644 new mode 100755 index ba818c9d6..22f43b82d --- a/trunk/src/app/srs_app_st.cpp +++ b/trunk/src/app/srs_app_st.cpp @@ -237,6 +237,7 @@ void srs_close_stfd(st_netfd_t& stfd) // we must ensure the close is ok. int err = st_netfd_close(stfd); srs_assert(err != -1); + stfd = NULL; } }