mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
Fix bug
This commit is contained in:
parent
7dcfd6b029
commit
a2d9f0a9ad
9 changed files with 13 additions and 6 deletions
|
@ -3662,7 +3662,7 @@ srs_error_t SrsConfig::check_normal_config()
|
|||
for (int i = 0; i < (int)listens.size(); i++) {
|
||||
string port = listens[i];
|
||||
if (port.empty() || ::atoi(port.c_str()) <= 0) {
|
||||
return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "listen.port=%d is invalid", port.c_str());
|
||||
return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "listen.port=%s is invalid", port.c_str());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -307,6 +307,7 @@ SrsDashController::SrsDashController()
|
|||
vfragments = new SrsFragmentWindow();
|
||||
afragments = new SrsFragmentWindow();
|
||||
audio_dts = video_dts = 0;
|
||||
fragment = 0;
|
||||
}
|
||||
|
||||
SrsDashController::~SrsDashController()
|
||||
|
|
|
@ -585,6 +585,7 @@ string SrsDvrAsyncCallOnDvr::to_string()
|
|||
SrsDvrPlan::SrsDvrPlan()
|
||||
{
|
||||
req = NULL;
|
||||
hub = NULL;
|
||||
|
||||
dvr_enabled = false;
|
||||
segment = NULL;
|
||||
|
|
|
@ -134,7 +134,7 @@ srs_error_t SrsVodStream::serve_flv_stream(ISrsHttpResponseWriter* w, ISrsHttpMe
|
|||
|
||||
// send data
|
||||
if ((err = copy(w, fs, r, (int)left)) != srs_success) {
|
||||
return srs_error_wrap(err, "read flv=%s size=%d", fullpath.c_str(), left);
|
||||
return srs_error_wrap(err, "read flv=%s size=%d", fullpath.c_str(), (int)left);
|
||||
}
|
||||
|
||||
return err;
|
||||
|
@ -184,7 +184,7 @@ srs_error_t SrsVodStream::serve_mp4_stream(ISrsHttpResponseWriter* w, ISrsHttpMe
|
|||
|
||||
// send data
|
||||
if ((err = copy(w, fs, r, (int)left)) != srs_success) {
|
||||
return srs_error_wrap(err, "read mp4=%s size=%d", fullpath.c_str(), left);
|
||||
return srs_error_wrap(err, "read mp4=%s size=%d", fullpath.c_str(), (int)left);
|
||||
}
|
||||
|
||||
return err;
|
||||
|
|
|
@ -121,6 +121,9 @@ SrsRtmpConn::SrsRtmpConn(SrsServer* svr, srs_netfd_t c, string cip, int port) :
|
|||
send_min_interval = 0;
|
||||
tcp_nodelay = false;
|
||||
info = new SrsClientInfo();
|
||||
|
||||
publish_1stpkt_timeout = 0;
|
||||
publish_normal_timeout = 0;
|
||||
|
||||
_srs_config->subscribe(this);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue