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

[stefano]

Author: stefano
Date: Fri Jul  3 13:14:37 2009
New Revision: 19329

Log:
Revert r19321.
The changes were not approved.

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

Modified: branches/0.5/doc/ffmpeg-doc.texi
==============================================================================
--- branches/0.5/doc/ffmpeg-doc.texi	Fri Jul  3 07:52:00 2009	(r19328)
+++ branches/0.5/doc/ffmpeg-doc.texi	Fri Jul  3 13:14:37 2009	(r19329)
@@ -276,16 +276,29 @@ 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 -metadata @var{key}=@var{value}
-Set a metadata key/value pair.
+ at item -author @var{string}
+Set the author.
 
-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
+ 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 -year @var{number}
+Set the year.
 
 @item -v @var{number}
 Set the logging verbosity level.