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

add dvr option. refine macros of auto headers

Browse source
This commit is contained in:
winlin 2014-04-15 14:01:57 +08:00
parent 1ae9178605
commit 23a1b29935
34 changed files with 242 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1206,7 +1206,7 @@ void SrsConfig::print_help(char** argv)
printf(
RTMP_SIG_SRS_NAME" "RTMP_SIG_SRS_VERSION" "RTMP_SIG_SRS_COPYRIGHT"\n"
"Primary Authors: "RTMP_SIG_SRS_PRIMARY_AUTHROS"\n"
"Build: "SRS_BUILD_DATE" Configuration:"SRS_CONFIGURE"\n"
"Build: "SRS_AUTO_BUILD_DATE" Configuration:"SRS_AUTO_CONFIGURE"\n"
"Usage: %s [-h?vV] [[-t] -c <filename>]\n"
"\n"
"Options:\n"
@ -2132,13 +2132,13 @@ string SrsConfig::get_ingest_input_type(SrsConfDirective* ingest)
SrsConfDirective* conf = ingest->get("input");
if (!conf) {
return SRS_RTMP_INGEST_TYPE_FILE;
return SRS_AUTO_INGEST_TYPE_FILE;
}
conf = conf->get("type");
if (!conf) {
return SRS_RTMP_INGEST_TYPE_FILE;
return SRS_AUTO_INGEST_TYPE_FILE;
}
return conf->arg0();