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

fix demo script, start nginx. fix warning of utest on ubuntu14

Browse source
This commit is contained in:
winlin 2014-06-29 10:03:29 +08:00
parent e6f524281c
commit ee07210105
7 changed files with 92 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

13
trunk/src/libs/srs_librtmp.cpp
View file

@ -262,18 +262,7 @@ int srs_connect_app(srs_rtmp_t rtmp)
srs_assert(rtmp != NULL);
Context* context = (Context*)rtmp;
string tcUrl = "rtmp://";
// TODO: FIXME: extrace shared method
if (context->vhost == RTMP_VHOST_DEFAULT) {
tcUrl += context->ip;
} else {
tcUrl += context->vhost;
}
tcUrl += ":";
tcUrl += context->port;
tcUrl += "/";
tcUrl += context->app;
string tcUrl = srs_generate_tc_url(context->ip, context->vhost, context->app, context->port);
if ((ret = context->rtmp->connect_app(context->app, tcUrl)) != ERROR_SUCCESS) {
return ret;
}