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

implements ingest, change to 0.9.53

Browse source
This commit is contained in:
winlin 2014-04-07 14:20:03 +08:00
parent 2742679354
commit e89ab84e4e
13 changed files with 357 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

10
trunk/src/app/srs_app_ffmpeg.cpp
View file

@ -73,6 +73,11 @@ SrsFFMPEG::~SrsFFMPEG()
stop();
}
void SrsFFMPEG::set_iparams(string iparams)
{
_iparams = iparams;
}
string SrsFFMPEG::output()
{
return _output;
@ -232,6 +237,11 @@ int SrsFFMPEG::start()
// the filename associated with the file being executed.
params.push_back(ffmpeg);
// input params
if (!_iparams.empty()) {
params.push_back(_iparams);
}
// input.
params.push_back("-f");
params.push_back("flv");