summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-20 19:55:44 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-20 20:15:40 +0100
commit50255b7a865f0dd4fecf8d1e337f96b92b4b406e (patch)
tree56c4827a3de1357eaca5704a17f1303795198269 /doc
parent60b9373dbd52bba91d2286d5f8a1366090a9df08 (diff)
parent342fc46c69199b076b7c210f42208ce39a2bde1c (diff)
downloadffmpeg-streaming-50255b7a865f0dd4fecf8d1e337f96b92b4b406e.zip
ffmpeg-streaming-50255b7a865f0dd4fecf8d1e337f96b92b4b406e.tar.gz
Merge commit '342fc46c69199b076b7c210f42208ce39a2bde1c'
* commit '342fc46c69199b076b7c210f42208ce39a2bde1c': cmdutils: Add a stream specifier to map usable streams Conflicts: cmdutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
-rw-r--r--doc/fftools-common-opts.texi3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/fftools-common-opts.texi b/doc/fftools-common-opts.texi
index 6556909..2e7c9f7 100644
--- a/doc/fftools-common-opts.texi
+++ b/doc/fftools-common-opts.texi
@@ -50,6 +50,9 @@ Match the stream by stream id (e.g. PID in MPEG-TS container).
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.
+@item u
+Matches streams with usable configuration, the codec must be defined and the
+essential information such as video dimension or audio sample rate must be present.
Note that in @command{ffmpeg}, matching by metadata will only work properly for
input files.
OpenPOWER on IntegriCloud