diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 13:00:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 13:00:39 +0100 |
| commit | ac1a1fd7088ca903ff3c568612d6a7c2126772a9 (patch) | |
| tree | f04f088b1a9c591763c1f462107fbfa54d039601 /doc | |
| parent | 705b607db88f4578e1d1c8b0c467cbc23256861e (diff) | |
| parent | 1ae44c87c924b69a0657256fbaa8ad140df2f27c (diff) | |
| download | ffmpeg-ac1a1fd7088ca903ff3c568612d6a7c2126772a9.tar.gz | |
Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c'
* commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c':
lavfi/gradfun: remove rounding to match C and SSE code.
lavfi/gradfun: fix dithering in MMX code.
lavfi/gradfun: fix rounding in MMX code.
lavfi/gradfun: do not increment DC pointer for odd values.
fate: filter: Add dependencies
avconv: add options for reading filtergraphs from a file.
Conflicts:
Changelog
doc/ffmpeg.texi
doc/filters.texi
ffmpeg.h
ffmpeg_opt.c
libavfilter/vf_gradfun.c
tests/fate/filter.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ffmpeg.texi | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index ca5d652f84..d3bf40543b 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -359,6 +359,11 @@ syntax. See the @ref{filter_complex_option,,-filter_complex option} if you want to create filter graphs with multiple inputs and/or outputs. +@item -filter_script[:@var{stream_specifier}] @var{filename} (@emph{output,per-stream}) +This option is similar to @option{-filter}, the only difference is that its +argument is the name of the file from which a filtergraph description is to be +read. + @item -pre[:@var{stream_specifier}] @var{preset_name} (@emph{output,per-stream}) Specify the preset for matching stream(s). @@ -1049,6 +1054,11 @@ ffmpeg -filter_complex 'color=c=red' -t 5 out.mkv Define a complex filter graph, i.e. one with arbitrary number of inputs and/or outputs. Equivalent to @option{-filter_complex}. +@item -filter_complex_script @var{filename} (@emph{global}) +This option is similar to @option{-filter_complex}, the only difference is that +its argument is the name of the file from which a complex filtergraph +description is to be read. + @end table As a special exception, you can use a bitmap subtitle stream as input: it |