From a2e473380b6134ab01093aaddd87b3f5dd62d50b Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Tue, 22 Jun 2010 22:54:36 +0000 Subject: [PATCH] Extend documentation for the ffmpeg -timestamp option. '(' and ')' are used instead of '{' and '}' in the date specification as the latter confound the texinfo interpreter. Originally committed as revision 23726 to svn://svn.ffmpeg.org/ffmpeg/trunk --- doc/ffmpeg-doc.texi | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi index 95e419dbbe..effb41a5a4 100644 --- a/doc/ffmpeg-doc.texi +++ b/doc/ffmpeg-doc.texi @@ -99,7 +99,16 @@ Specifying a positive offset means that the corresponding 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: +@example +now|([(YYYY-MM-DD|YYYYMMDD)[T|t| ]]((HH[:MM[:SS[.m...]]])|(HH[MM[SS[.m...]]]))[Z|z]) +@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.