diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-05 02:04:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-05 03:10:45 +0200 |
| commit | d2084402e6034e8d49ea50ebe212c4e8783d028a (patch) | |
| tree | 4887311120f2f7f5bdd105c919e60615ec9f53fb /ffserver.c | |
| parent | b881a2e254f3948a2ff1775a7e2ae58abdef96b6 (diff) | |
| parent | fb47997edb9d8ff16fc380d005a08c0545624aa6 (diff) | |
| download | ffmpeg-d2084402e6034e8d49ea50ebe212c4e8783d028a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: fix type for thread_type option
avconv: move format to options context
avconv: move limit_filesize to options context
avconv: move start_time, recording_time and input_ts_offset to options context
avconv: add a context for options.
cmdutils: allow storing per-stream/chapter/.... options in a generic way
cmdutils: split per-option code out of parse_options().
cmdutils: add support for caller-provided option context.
cmdutils: declare only one pointer type in OptionDef
cmdutils: move grow_array() from avconv to cmdutils.
cmdutils: move exit_program() declaration to cmdutils from avconv
http: Consider the stream as seekable if the reply contains Accept-Ranges: bytes
nutenc: add namespace to the api facing functions
Conflicts:
avconv.c
cmdutils.c
cmdutils.h
ffmpeg.c
ffplay.c
ffprobe.c
ffserver.c
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ffserver.c b/ffserver.c index f0bdb828b2..cf055a53cd 100644 --- a/ffserver.c +++ b/ffserver.c @@ -321,6 +321,11 @@ static AVLFG random_state; static FILE *logfile = NULL; /* FIXME: make ffserver work with IPv6 */ +void exit_program(int ret) +{ + exit(ret); +} + /* resolve host with also IP address parsing */ static int resolve_host(struct in_addr *sin_addr, const char *hostname) { @@ -4672,7 +4677,7 @@ int main(int argc, char **argv) my_program_dir = getcwd(0, 0); ffserver_daemon = 1; - parse_options(argc, argv, options, NULL); + parse_options(NULL, argc, argv, options, NULL); unsetenv("http_proxy"); /* Kill the http_proxy */ |