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 from srs2.

Browse source
This commit is contained in:
winlin 2015-12-31 16:02:01 +08:00
commit 973194c663
7 changed files with 33 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -228,6 +228,9 @@ void show_macro_features()
int main(int argc, char** argv)
{
int ret = ERROR_SUCCESS;
// first hello message.
srs_trace(RTMP_SIG_SRS_SERVER);
// TODO: support both little and big endian.
srs_assert(srs_is_little_endian());
@ -266,7 +269,7 @@ int main(int argc, char** argv)
}
// config already applied to log.
srs_trace("srs(ossrs) "RTMP_SIG_SRS_VERSION", stable is "RTMP_SIG_SRS_PRIMARY);
srs_trace(RTMP_SIG_SRS_SERVER", stable is "RTMP_SIG_SRS_PRIMARY);
srs_trace("license: "RTMP_SIG_SRS_LICENSE", "RTMP_SIG_SRS_COPYRIGHT);
srs_trace("authors: "RTMP_SIG_SRS_AUTHROS);
srs_trace("contributors: "SRS_AUTO_CONSTRIBUTORS);