[FFmpeg-cvslog] r19321 - branches/0.5/doc/ffmpeg-doc.texi

[stefano]

Author: stefano
Date: Wed Jul  1 22:14:19 2009
New Revision: 19321

Log:
Update ffmpeg documentation regarding metadata setting. -title,
-author, -copyright, -track, -album, and -year options have been
dropped in favor of -metadata.

Backfix of r19285, r19287, and r19320.

Modified:
   branches/0.5/doc/ffmpeg-doc.texi

Modified: branches/0.5/doc/ffmpeg-doc.texi
==============================================================================
--- branches/0.5/doc/ffmpeg-doc.texi	Wed Jul  1 22:11:53 2009	(r19320)
+++ branches/0.5/doc/ffmpeg-doc.texi	Wed Jul  1 22:14:19 2009	(r19321)
@@ -276,29 +276,16 @@ The offset is added to the timestamps of
 Specifying a positive offset means that the corresponding
 streams are delayed by 'offset' seconds.
 
- at item -title @var{string}
-Set the title.
-
 @item -timestamp @var{time}
 Set the timestamp.
 
- at item -author @var{string}
-Set the author.
-
- at item -copyright @var{string}
-Set the copyright.
-
- at item -comment @var{string}
-Set the comment.
-
- at item -album @var{string}
-Set the album.
-
- at item -track @var{number}
-Set the track.
+ at item -metadata @var{key}=@var{value}
+Set a metadata key/value pair.
 
- at item -year @var{number}
-Set the year.
+For example, for setting the title in the output file:
+ at example
+ffmpeg -i in.avi -metadata title="my title" out.flv
+ at end example
 
 @item -v @var{number}
 Set the logging verbosity level.