[FFmpeg-cvslog] r23726 - trunk/doc/ffmpeg-doc.texi

stefano subversion
Wed Jun 23 00:54:36 CEST 2010


Author: stefano
Date: Wed Jun 23 00:54:36 2010
New Revision: 23726

Log:
Extend documentation for the ffmpeg -timestamp option.

'(' and ')' are used instead of '{' and '}' in the date specification
as the latter confound the texinfo interpreter.

Modified:
   trunk/doc/ffmpeg-doc.texi

Modified: trunk/doc/ffmpeg-doc.texi
==============================================================================
--- trunk/doc/ffmpeg-doc.texi	Wed Jun 23 00:54:32 2010	(r23725)
+++ trunk/doc/ffmpeg-doc.texi	Wed Jun 23 00:54:36 2010	(r23726)
@@ -99,7 +99,16 @@ Specifying a positive offset means that 
 streams are delayed by 'offset' seconds.
 
 @item -timestamp @var{time}
-Set the timestamp.
+Set the recording timestamp in the container.
+The syntax for @var{time} is:
+ at example
+now|([(YYYY-MM-DD|YYYYMMDD)[T|t| ]]((HH[:MM[:SS[.m...]]])|(HH[MM[SS[.m...]]]))[Z|z])
+ at end example
+If the value is "now" it takes the current time.
+Time is local time unless 'Z' or 'z' is appended, in which case it is
+interpreted as UTC.
+If the year-month-day part is not specified it takes the current
+year-month-day.
 
 @item -metadata @var{key}=@var{value}
 Set a metadata key/value pair.



More information about the ffmpeg-cvslog mailing list