merge from 2.0release

pull/779/head
winlin 9 years ago
commit 36eb0981ec

@ -206,7 +206,7 @@ namespace internal
srs_warn("thread %s on before cycle failed, ignored and retry, ret=%d", _name, ret);
goto failed;
}
srs_info("thread %s on before cycle success");
srs_info("thread %s on before cycle success", _name);
if ((ret = handler->cycle()) != ERROR_SUCCESS) {
if (!srs_is_client_gracefully_close(ret) && !srs_is_system_control_error(ret)) {

Loading…
Cancel
Save