mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
the join maybe failed, should use a variable to ensure thread terminated. 1.0.28.
This commit is contained in:
parent
9a7696a7c2
commit
ccc30c70c4
3 changed files with 5 additions and 2 deletions
|
@ -388,6 +388,7 @@ Supported operating systems and hardware:
|
|||
|
||||
## History
|
||||
|
||||
* v1.0, 2015-02-17, the join maybe failed, should use a variable to ensure thread terminated. 1.0.28.
|
||||
* <strong>v1.0, 2015-02-12, [1.0r2 release(1.0.27)](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0r2) released. 59507 lines.</strong>
|
||||
* v1.0, 2015-02-11, dev code HuKaiqun for 1.0.27.
|
||||
* v1.0, 2015-02-10, for [#310](https://github.com/winlinvip/simple-rtmp-server/issues/310), the aac profile must be object plus one. 1.0.26
|
||||
|
|
|
@ -120,7 +120,9 @@ void SrsThread::stop()
|
|||
st_thread_interrupt(tid);
|
||||
|
||||
// wait the thread to exit.
|
||||
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.
|
||||
srs_assert(ret == 0);
|
||||
|
||||
tid = NULL;
|
||||
}
|
||||
|
|
|
@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
// current release version
|
||||
#define VERSION_MAJOR 1
|
||||
#define VERSION_MINOR 0
|
||||
#define VERSION_REVISION 27
|
||||
#define VERSION_REVISION 28
|
||||
|
||||
// server info.
|
||||
#define RTMP_SIG_SRS_KEY "SRS"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue