summaryrefslogtreecommitdiff
path: root/doc/avconv.texi
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-07-29 13:07:27 +0200
committerAnton Khirnov <anton@khirnov.net>2011-08-12 13:50:36 +0200
commite6e6060c9be60f5eb6c94556ca4c92f76cba0d1f (patch)
tree0b9339f5f4d576a54fadf4a0f5152d818d7ff78c /doc/avconv.texi
parentc9065c29176bade732745425029116b0548a959c (diff)
avconv: make -map_metadata work consistently with the other options
Before, it took an input and output file index, now it only takes an input file and applies to the next output file. Stream/chapter/program specification is now part of the option name and the delimiter was changed from ',' to ':' to be consistent with the similar feature for AVOptions.
Diffstat (limited to 'doc/avconv.texi')
-rw-r--r--doc/avconv.texi14
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/avconv.texi b/doc/avconv.texi
index 32808fd32c..ab1df09fb3 100644
--- a/doc/avconv.texi
+++ b/doc/avconv.texi
@@ -677,16 +677,16 @@ avconv -i a.mov -i b.mov -vcodec copy -acodec copy out.mov -map 0.2 -map 1.6
To add more streams to the output file, you can use the
@code{-newaudio}, @code{-newvideo}, @code{-newsubtitle} options.
-@item -map_metadata @var{outfile}[,@var{metadata}]:@var{infile}[,@var{metadata}]
-Set metadata information of @var{outfile} from @var{infile}. Note that those
-are file indices (zero-based), not filenames.
-Optional @var{metadata} parameters specify, which metadata to copy - (g)lobal
+@item -map_metadata[:@var{metadata_type}][:@var{index}] @var{infile}[:@var{metadata_type}][:@var{index}]
+Set metadata information of the next output file from @var{infile}. Note that
+those are file indices (zero-based), not filenames.
+Optional @var{metadata_type} parameters specify, which metadata to copy - (g)lobal
(i.e. metadata that applies to the whole file), per-(s)tream, per-(c)hapter or
per-(p)rogram. All metadata specifiers other than global must be followed by the
-stream/chapter/program number. If metadata specifier is omitted, it defaults to
+stream/chapter/program index. If metadata specifier is omitted, it defaults to
global.
-By default, global metadata is copied from the first input file to all output files,
+By default, global metadata is copied from the first input file,
per-stream and per-chapter metadata is copied along with streams/chapters. These
default mappings are disabled by creating any mapping of the relevant type. A negative
file index can be used to create a dummy mapping that just disables automatic copying.
@@ -694,7 +694,7 @@ file index can be used to create a dummy mapping that just disables automatic co
For example to copy metadata from the first stream of the input file to global metadata
of the output file:
@example
-avconv -i in.ogg -map_metadata 0:0,s0 out.mp3
+avconv -i in.ogg -map_metadata 0:s:0 out.mp3
@end example
@item -map_chapters @var{input_file_index}
Copy chapters from input file with index @var{input_file_index} to the next