external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

warning when join thread failed. 1.0.29

Browse source
This commit is contained in:
winlin 2015-03-10 14:35:20 +08:00
parent ccc30c70c4
commit 6d64e38656
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/src/app/srs_app_thread.cpp
View file

@ -122,7 +122,9 @@ void SrsThread::stop()
// wait the thread to exit. // wait the thread to exit.
int ret = st_thread_join(tid, NULL); int ret = st_thread_join(tid, NULL);
// TODO: FIXME: the join maybe failed, should use a variable to ensure thread terminated. // TODO: FIXME: the join maybe failed, should use a variable to ensure thread terminated.
srs_assert(ret == 0); if (ret != 0) {
srs_warn("join thread failed. code=%d", ret);
}
tid = NULL; tid = NULL;
} }

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 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 28 #define VERSION_REVISION 29
// server info. // server info.
#define RTMP_SIG_SRS_KEY "SRS" #define RTMP_SIG_SRS_KEY "SRS"