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 for #536

Browse source
This commit is contained in:
winlin 2017-01-16 12:47:48 +08:00
commit 750f4413c8
4 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/src/app/srs_app_encoder.cpp
View file

@ -298,6 +298,10 @@ int SrsEncoder::initialize_ffmpeg(SrsFFMPEG* ffmpeg, SrsRequest* req, SrsConfDir
log_file += req->app;
log_file += "-";
log_file += req->stream;
if (!engine->args.empty()) {
log_file += "-";
log_file += engine->arg0();
}
log_file += ".log";
}

1
trunk/src/app/srs_app_ffmpeg.hpp
View file

@ -47,6 +47,7 @@ class SrsFFMPEG
private:
SrsProcess* process;
std::vector<std::string> params;
private:
std::string log_file;
private:
std::string ffmpeg;