diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-03-30 22:31:18 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-04-11 20:33:33 +0200 |
| commit | 38f0c0781a6e099f11c0acec07f9b8be742190c4 (patch) | |
| tree | f95058ce58bceb1c9f78c94a65b70949491ddb6b /doc | |
| parent | 4a37d4b3f8137a4c2bbbca043de076af966b9446 (diff) | |
lavfi: merge avfiltergraph.h into avfilter.h
We do not support using filters without AVFilterGraph in practice
anyway, so there is no point in pretending we do.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/APIchanges | 4 | ||||
| -rw-r--r-- | doc/filters.texi | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index e4597b9413..490d24b385 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,10 @@ libavutil: 2012-10-22 API changes, most recent first: +2013-xx-xx - lavfi 3.8.0 + Move all content from avfiltergraph.h to avfilter.h. Deprecate + avfilterhraph.h, user applications should include just avfilter.h + 2013-xx-xx - lavfi 3.7.0 - avfilter.h Add AVFilter.priv_class for exporting filter options through the AVOptions API in the similar way private options work in lavc and lavf. diff --git a/doc/filters.texi b/doc/filters.texi index 87a3d1f48a..853d047998 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -21,7 +21,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{avconv} and @option{-vf} in @command{avplay}, 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 |