summaryrefslogtreecommitdiff
path: root/doc/fftools-common-opts.texi
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-14 00:41:08 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-14 00:41:21 +0200
commitb8e4c11d93326cd86278d012c28e54dca0a06cef (patch)
tree96ed0fc1c7d5db348b532dd993710430290585a1 /doc/fftools-common-opts.texi
parentc8571c61ec4c352e7eac7147b7c1644d2406189e (diff)
parent481a3667495425db9fdffb653292b6460fb68208 (diff)
Merge commit '481a3667495425db9fdffb653292b6460fb68208'
* commit '481a3667495425db9fdffb653292b6460fb68208': cmdutils: allow matching by metadata in stream specifiers Conflicts: Changelog cmdutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/fftools-common-opts.texi')
-rw-r--r--doc/fftools-common-opts.texi7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/fftools-common-opts.texi b/doc/fftools-common-opts.texi
index ab627ca4a9..6ee6292c5f 100644
--- a/doc/fftools-common-opts.texi
+++ b/doc/fftools-common-opts.texi
@@ -46,6 +46,13 @@ in the program with the id @var{program_id}. Otherwise, it matches all streams i
program.
@item #@var{stream_id} or i:@var{stream_id}
Match the stream by stream id (e.g. PID in MPEG-TS container).
+@item m:@var{key}[:@var{value}]
+Matches streams with the metadata tag @var{key} having the specified value. If
+@var{value} is not given, matches streams that contain the given tag with any
+value.
+
+Note that in @command{avconv}, matching by metadata will only work properly for
+input files.
@end table
@section Generic options