external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

merge srs2.

Browse source
This commit is contained in:
winlin 2016-10-10 11:56:10 +08:00
commit 112d98ffdb
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
trunk/src/app/srs_app_listener.cpp Normal file → Executable file
View file

@ -193,15 +193,10 @@ SrsTcpListener::SrsTcpListener(ISrsTcpHandler* h, string i, int p)
SrsTcpListener::~SrsTcpListener() SrsTcpListener::~SrsTcpListener()
{ {
// close the stfd to trigger thread to interrupted.
srs_close_stfd(_stfd);
pthread->stop(); pthread->stop();
srs_freep(pthread); srs_freep(pthread);
// st does not close it sometimes, srs_close_stfd(_stfd);
// close it manually.
close(_fd);
} }
int SrsTcpListener::fd() int SrsTcpListener::fd()

2
trunk/src/core/srs_core.hpp
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version // current release version
#define VERSION_MAJOR 3 #define VERSION_MAJOR 3
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 218 #define VERSION_REVISION 219
// generated by configure, only macros. // generated by configure, only macros.
#include <srs_auto_headers.hpp> #include <srs_auto_headers.hpp>