1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00

Merge 2.0release

This commit is contained in:
winlin 2018-11-27 21:24:51 +08:00
commit ba4ef34d27
13 changed files with 121 additions and 21 deletions

View file

@ -282,6 +282,7 @@ srs_error_t SrsEncoder::initialize_ffmpeg(SrsFFMPEG* ffmpeg, SrsRequest* req, Sr
output = srs_string_replace(output, "[port]", srs_int2str(req->port));
output = srs_string_replace(output, "[app]", req->app);
output = srs_string_replace(output, "[stream]", req->stream);
output = srs_string_replace(output, "[param]", req->param);
output = srs_string_replace(output, "[engine]", engine->arg0());
std::string log_file = SRS_CONSTS_NULL_FILE; // disabled