diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-28 01:31:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-28 02:07:44 +0200 |
| commit | 23c1db9b83b5928a312b8d7cd753d04d49c252b6 (patch) | |
| tree | 2bd8a38bed63003a8ed606a8c1b85c9a8f208548 /doc/avtools-common-opts.texi | |
| parent | feca3ba053499e0d38f48910cef9bc431036956f (diff) | |
| parent | d3c1d37a9019ed32a1710d53c1ad08c44bd072da (diff) | |
| download | ffmpeg-23c1db9b83b5928a312b8d7cd753d04d49c252b6.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: use different variables for decoded and filtered frame.
avconv: add support for copying attachments.
matroskaenc: write attachments.
matroskadec: export mimetype of attachments as metadata.
avconv: factorize common code from new_*_stream()
doc/avconv: expand documentation for some options.
doc/avconv: document -timelimit.
Conflicts:
avconv.c
cmdutils.c
tests/codec-regression.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/avtools-common-opts.texi')
| -rw-r--r-- | doc/avtools-common-opts.texi | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/avtools-common-opts.texi b/doc/avtools-common-opts.texi index 82d774c0de..e351cc6984 100644 --- a/doc/avtools-common-opts.texi +++ b/doc/avtools-common-opts.texi @@ -33,9 +33,10 @@ Possible forms of stream specifiers are: Matches the stream with this index. E.g. @code{-threads:1 4} would set the thread count for the second stream to 4. @item @var{stream_type}[:@var{stream_index}] -@var{stream_type} is one of: 'v' for video, 'a' for audio, 's' for subtitle and -'d' for data. If @var{stream_index} is given, then matches stream number -@var{stream_index} of this type. Otherwise matches all streams of this type. +@var{stream_type} is one of: 'v' for video, 'a' for audio, 's' for subtitle, +'d' for data and 't' for attachments. If @var{stream_index} is given, then +matches stream number @var{stream_index} of this type. Otherwise matches all +streams of this type. @item @var{program_id}[:@var{stream_index}] If @var{stream_index} is given, then matches stream number @var{stream_index} in program with id @var{program_id}. Otherwise matches all streams in this program. |