aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-02-02 21:45:16 +0100
committerJanne Grunau <janne-ffmpeg@jannau.net>2011-02-02 22:44:37 +0100
commit87e4d9b252bc6fa3b982f7050013069c9dc3e05b (patch)
tree7e6afb4b1f5a45b51aa7178a7e5cdb31f3da2b05 /doc
parent4868bebe5bfd018e1f525c33ab2f180bf0ca1213 (diff)
downloadffmpeg-87e4d9b252bc6fa3b982f7050013069c9dc3e05b.tar.gz
ffmpeg.c: rename map_meta_data option to map_metadata
It's consistent with the -metadata option and easier to write. Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
Diffstat (limited to 'doc')
-rw-r--r--doc/ffmpeg.texi7
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 047444ab62..8b8e42f1f6 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -628,7 +628,10 @@ Just enumerate the input streams in the order you want them in the output.
@var{sync_stream_id} if specified sets the input stream to sync
against.
@item -map_meta_data @var{outfile}[,@var{metadata}]:@var{infile}[,@var{metadata}]
-Set meta data information of @var{outfile} from @var{infile}. Note that those
+Deprecated, use @var{-map_metadata} instead.
+
+@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
(i.e. metadata that applies to the whole file), per-(s)tream, per-(c)hapter or
@@ -644,7 +647,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
-ffmpeg -i in.ogg -map_meta_data 0:0,s0 out.mp3
+ffmpeg -i in.ogg -map_metadata 0:0,s0 out.mp3
@end example
@item -map_chapters @var{outfile}:@var{infile}
Copy chapters from @var{infile} to @var{outfile}. If no chapter mapping is specified,