| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-08 23:48:29 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-08 23:50:32 (GMT) |
| commit | d1e8d4b055bd9a79baa15ca80d9a1476d2a8ccdb (patch) | |
| tree | fcadc9e723ab3f6a2be012472192484c7dcb43a3 | |
| parent | d7fbe926d312af0848bfb22dbe03894b381848f3 (diff) | |
| download | ffmpeg-d1e8d4b055bd9a79baa15ca80d9a1476d2a8ccdb.zip ffmpeg-d1e8d4b055bd9a79baa15ca80d9a1476d2a8ccdb.tar.gz ffmpeg-d1e8d4b055bd9a79baa15ca80d9a1476d2a8ccdb.tar.bz2 | |
ffmpeg: Allow overriding ffservers input
Fixes Ticket1970
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | ffmpeg_opt.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index a459bc9..3ae2d61 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -93,6 +93,7 @@ static int video_discard = 0; static int intra_dc_precision = 8; static int do_psnr = 0; static int input_sync; +static int override_ffserver = 0; static int64_t recording_time = INT64_MAX; @@ -1646,7 +1647,7 @@ static int open_output_file(OptionsContext *o, const char *filename) } } - if (!strcmp(file_oformat->name, "ffm") && + if (!strcmp(file_oformat->name, "ffm") && !override_ffserver && av_strstart(filename, "http:", NULL)) { int j; /* special case for files sent to ffserver: we get the stream @@ -2836,6 +2837,8 @@ const OptionDef options[] = { "set the maximum demux-decode delay", "seconds" }, { "muxpreload", OPT_FLOAT | HAS_ARG | OPT_EXPERT | OPT_OFFSET | OPT_OUTPUT, { .off = OFFSET(mux_preload) }, "set the initial demux-decode delay", "seconds" }, + { "override_ffserver", OPT_BOOL | OPT_EXPERT | OPT_OUTPUT, { &override_ffserver }, + "override the options from ffserver", "" }, { "bsf", HAS_ARG | OPT_STRING | OPT_SPEC | OPT_EXPERT | OPT_OUTPUT, { .off = OFFSET(bitstream_filters) }, "A comma-separated list of bitstream filters", "bitstream_filters" }, |