diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 23:40:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 23:50:39 +0200 |
| commit | 231fd4411ff35762cb82145c9bebc2dd1db191e0 (patch) | |
| tree | 053e96f54c1d5ad892d0546b5260f6c32cf329b1 /doc/filters.texi | |
| parent | 9110f95985a0860ba7707cb57524a756c74551e3 (diff) | |
| parent | 38f0c0781a6e099f11c0acec07f9b8be742190c4 (diff) | |
| download | ffmpeg-231fd4411ff35762cb82145c9bebc2dd1db191e0.tar.gz | |
Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4'
* commit '38f0c0781a6e099f11c0acec07f9b8be742190c4':
lavfi: merge avfiltergraph.h into avfilter.h
Conflicts:
doc/APIchanges
ffmpeg_filter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.h
libavfilter/version.h
tools/graph2dot.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/filters.texi')
| -rw-r--r-- | doc/filters.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index 1bb2d9be27..d3777efc4f 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -117,7 +117,7 @@ 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}. +@file{libavfilter/avfilter.h}. A filterchain consists of a sequence of connected filters, each one connected to the previous one in the sequence. A filterchain is |