diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-17 12:13:22 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-17 12:13:22 +0200 |
commit | 15141f939dc725451644869f4d413adb46927677 (patch) | |
tree | e0aba01c6ebbe093e4b3265ae94f639628c1053f /doc/filters.texi | |
parent | 68ca49dc7256bbe413ce29fa3fc47bb4143304c0 (diff) | |
parent | 8b84e082ed27fb635fca524fbd14b1db094ee8b0 (diff) | |
download | ffmpeg-15141f939dc725451644869f4d413adb46927677.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
indeo3: add parens around some macro arguments
h264: use proper PROLOGUE statement for a function using 8 registers.
doc: Update sample Vim config with suitable (function) indentation settings.
dv: Merge dvquant.h into dvdata.c where all other DV tables reside.
dv: Move static tables only used in one place to where they are used.
graphparser: set next to NULL on an entry extracted from inputs list
doc/filters: update documentation.
avconv: flush decoders immediately after an EOF.
avconv: send EOF to vsrc_buffer.
avconv: reindent.
Conflicts:
doc/filters.texi
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/filters.texi')
-rw-r--r-- | doc/filters.texi | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index 346c8317e4..f41adca3ee 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -17,9 +17,10 @@ output pads is called a "sink". @anchor{Filtergraph syntax} @section Filtergraph syntax -A filtergraph can be represented using a textual representation, which -is recognized by the @code{-vf} option of the ff* -tools, and by the @code{avfilter_graph_parse()} function defined in +A filtergraph can be represented using a textual representation, which is +recognized by the @option{-filter}/@option{-vf} and @option{-filter_complex} +options in @command{ffmpeg} and @option{-vf} in @command{ffplay}, and by the +@code{avfilter_graph_parse()}/@code{avfilter_graph_parse2()} function defined in @file{libavfilter/avfiltergraph.h}. A filterchain consists of a sequence of connected filters, each one @@ -2114,15 +2115,12 @@ Follow some examples: overlay=main_w-overlay_w-10:main_h-overlay_h-10 # insert a transparent PNG logo in the bottom left corner of the input -movie=logo.png [logo]; -[in][logo] overlay=10:main_h-overlay_h-10 [out] +ffmpeg -i input -i logo -filter_complex 'overlay=10:main_h-overlay_h-10' output # insert 2 different transparent PNG logos (second logo on bottom # right corner): -movie=logo1.png [logo1]; -movie=logo2.png [logo2]; -[in][logo1] overlay=10:H-h-10 [in+logo1]; -[in+logo1][logo2] overlay=W-w-10:H-h-10 [out] +ffmpeg -i input -i logo1 -i logo2 -filter_complex +'overlay=10:H-h-10,overlay=W-w-10:H-h-10' output # add a transparent color layer on top of the main video, # WxH specifies the size of the main input to the overlay filter |