aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2013-04-11 18:28:13 +0200
committerClément Bœsch <ubitux@gmail.com>2013-04-11 18:31:01 +0200
commitc74b0eda34f187cc879361f93bd1d8cd7a1c54e6 (patch)
tree64ee0e15ab96343d20299666ee8f40e6512a992c /doc
parenteabc0c733dee807d721d4c8a7acb7dd05684ef89 (diff)
downloadffmpeg-c74b0eda34f187cc879361f93bd1d8cd7a1c54e6.tar.gz
lavfi/amerge: switch to an AVOptions-based system.
Diffstat (limited to 'doc')
-rw-r--r--doc/filters.texi2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/filters.texi b/doc/filters.texi
index d6b9ca1112..097d3bce4c 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -759,7 +759,7 @@ aformat=sample_fmts=u8|s16:channel_layouts=stereo
Merge two or more audio streams into a single multi-channel stream.
-The filter accepts the following named options:
+The filter accepts the following options:
@table @option