diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2013-03-16 17:08:33 +0100 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2013-03-17 16:24:43 +0100 |
| commit | 40ea006b766e3c9b593de692e76bdb8cdf7f2786 (patch) | |
| tree | 1e2cb2590d7b21e0c45ab4687d8b745afeb26286 | |
| parent | 975fbd43addbf70c047167b761ddcf06e8083c14 (diff) | |
| download | ffmpeg-40ea006b766e3c9b593de692e76bdb8cdf7f2786.tar.gz | |
ffmpeg: make -lavfi an alias for -filter_complex.
| -rw-r--r-- | doc/ffmpeg.texi | 7 | ||||
| -rw-r--r-- | ffmpeg_opt.c | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 9848e0dd86..00c9b25fd4 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -167,6 +167,8 @@ Complex filtergraphs are configured with the @option{-filter_complex} option. Note that this option is global, since a complex filtergraph by its nature cannot be unambiguously associated with a single stream or file. +The @option{-lavfi} option is equivalent to @option{-filter_complex}. + A trivial example of a complex filtergraph is the @code{overlay} filter, which has two video inputs and one video output, containing one video overlaid on top of the other. Its audio counterpart is the @code{amix} filter. @@ -1032,6 +1034,11 @@ To generate 5 seconds of pure red video using lavfi @code{color} source: @example ffmpeg -filter_complex 'color=c=red' -t 5 out.mkv @end example + +@item -lavfi @var{filtergraph} (@emph{global}) +Define a complex filter graph, i.e. one with arbitrary number of inputs and/or +outputs. Equivalent to @option{-filter_complex}. + @end table As a special exception, you can use a bitmap subtitle stream as input: it diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 728d4745a4..4b2cfeb794 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -2603,6 +2603,8 @@ const OptionDef options[] = { "reinit filtergraph on input parameter changes", "" }, { "filter_complex", HAS_ARG | OPT_EXPERT, { .func_arg = opt_filter_complex }, "create a complex filtergraph", "graph_description" }, + { "lavfi", HAS_ARG | OPT_EXPERT, { .func_arg = opt_filter_complex }, + "create a complex filtergraph", "graph_description" }, { "stats", OPT_BOOL, { &print_stats }, "print progress report during encoding", }, { "attach", HAS_ARG | OPT_PERFILE | OPT_EXPERT | |