[FFmpeg-devel] [misc-parse-date PATCH 3/5] Extend documentation for -timestamp.

Stefano Sabatini stefano.sabatini-lala
Sun Jun 20 18:50:33 CEST 2010

'(' and ')' are used instead of '{' and '}' as the latter confound the
texinfo interpreter.
 doc/ffmpeg-doc.texi |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 342fe18..5637d3d 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:
+ 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 is appended, in which case it is
+interpreted as UTC.
+If the year-month-day part is not specified it takes the current
 @item -metadata @var{key}=@var{value}
 Set a metadata key/value pair.

More information about the ffmpeg-devel mailing list