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 15:20:16 +08:00
parent 9bf7b722db
commit f8423dfa90
5 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
trunk/src/app/srs_app_ingest.cpp
View file

@ -317,12 +317,14 @@ int SrsIngester::initialize_ffmpeg(SrsFFMPEG* ffmpeg, SrsConfDirective* vhost, S
ingest->arg0().c_str(), input_type.c_str(), ret);
}
// set output format to flv for RTMP
ffmpeg->set_oformat("flv");
std::string vcodec = _srs_config->get_engine_vcodec(engine);
std::string acodec = _srs_config->get_engine_acodec(engine);
// whatever the engine config, use copy as default.
if (!engine || vcodec.empty() || acodec.empty()
|| !_srs_config->get_engine_enabled(engine)
) {
bool engine_disabled = !engine || !_srs_config->get_engine_enabled(engine);
if (engine_disabled || vcodec.empty() || acodec.empty()) {
if ((ret = ffmpeg->initialize_copy()) != ERROR_SUCCESS) {
return ret;
}