aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-12 16:14:36 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-12 16:16:21 +0200
commit7e68491367ce60af078c0b53069a8011842bcd84 (patch)
tree57a938592f1afe5e994f15a960c5d69949f0c049 /doc
parent608d86013a8663ef5f2fc8c74998750ed2019149 (diff)
parent921046008f5335601f9d76dc3a768eb5cd91e1b9 (diff)
downloadffmpeg-7e68491367ce60af078c0b53069a8011842bcd84.tar.gz
Merge commit '921046008f5335601f9d76dc3a768eb5cd91e1b9'
* commit '921046008f5335601f9d76dc3a768eb5cd91e1b9': cmdutils: allow -h filter=<name> to print information about a filter. Conflicts: cmdutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
-rw-r--r--doc/avtools-common-opts.texi4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/avtools-common-opts.texi b/doc/avtools-common-opts.texi
index 4b52b58637..0921a87379 100644
--- a/doc/avtools-common-opts.texi
+++ b/doc/avtools-common-opts.texi
@@ -79,6 +79,10 @@ Print detailed information about the demuxer named @var{demuxer_name}. Use the
Print detailed information about the muxer named @var{muxer_name}. Use the
@option{-formats} option to get a list of all muxers and demuxers.
+@item filter=@var{filter_name}
+Print detailed information about the filter name @var{filter_name}. Use the
+@option{-filters} option to get a list of all filters.
+
@end table
@item -version