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

merge srs2, support oryx

Browse source
This commit is contained in:
winlin 2016-09-23 15:33:43 +08:00
commit 0e308b0fa1
7 changed files with 63 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/main/srs_main_server.cpp
View file

@ -264,7 +264,7 @@ int main(int argc, char** argv)
// change the work dir and set cwd.
string cwd = _srs_config->get_work_dir();
if (!cwd.empty() && (ret = chdir(cwd.c_str())) != ERROR_SUCCESS) {
if (!cwd.empty() && cwd != "./" && (ret = chdir(cwd.c_str())) != ERROR_SUCCESS) {
srs_error("change cwd to %s failed. ret=%d", cwd.c_str(), ret);
return ret;
}