diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 00:41:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 00:41:21 +0200 |
| commit | b8e4c11d93326cd86278d012c28e54dca0a06cef (patch) | |
| tree | 96ed0fc1c7d5db348b532dd993710430290585a1 /doc | |
| parent | c8571c61ec4c352e7eac7147b7c1644d2406189e (diff) | |
| parent | 481a3667495425db9fdffb653292b6460fb68208 (diff) | |
| download | ffmpeg-b8e4c11d93326cd86278d012c28e54dca0a06cef.tar.gz | |
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')
| -rw-r--r-- | doc/ffmpeg.texi | 5 | ||||
| -rw-r--r-- | doc/fftools-common-opts.texi | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index f741a053f5..158f4ed6cc 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -821,6 +821,11 @@ To map all the streams except the second audio, use negative mappings ffmpeg -i INPUT -map 0 -map -0:a:1 OUTPUT @end example +To pick the English audio stream: +@example +avconv -i INPUT -map 0:m:language:eng OUTPUT +@end example + Note that using this option disables the default mappings for this output file. @item -map_channel [@var{input_file_id}.@var{stream_specifier}.@var{channel_id}|-1][:@var{output_file_id}.@var{stream_specifier}] 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 |