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 #119: use iformat and oformat for ffmpeg transcode.

Browse source
This commit is contained in:
winlin 2014-07-19 10:54:38 +08:00
parent 2f0a72d7d1
commit 9bf7b722db
5 changed files with 61 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

28
trunk/src/app/srs_app_config.cpp
View file

@ -1965,6 +1965,20 @@ bool SrsConfig::get_engine_enabled(SrsConfDirective* engine)
return true;
}
string SrsConfig::get_engine_iformat(SrsConfDirective* engine)
{
if (!engine) {
return "flv";
}
SrsConfDirective* conf = engine->get("iformat");
if (!conf) {
return "flv";
}
return conf->arg0();
}
vector<string> SrsConfig::get_engine_vfilter(SrsConfDirective* engine)
{
vector<string> vfilter;
@ -2211,6 +2225,20 @@ vector<string> SrsConfig::get_engine_aparams(SrsConfDirective* engine)
return aparams;
}
string SrsConfig::get_engine_oformat(SrsConfDirective* engine)
{
if (!engine) {
return "flv";
}
SrsConfDirective* conf = engine->get("oformat");
if (!conf) {
return "flv";
}
return conf->arg0();
}
string SrsConfig::get_engine_output(SrsConfDirective* engine)
{
if (!engine) {