[SCM] libav/experimental: Extend documentation for the ffmpeg -timestamp option.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit a2e473380b6134ab01093aaddd87b3f5dd62d50b
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Tue Jun 22 22:54:36 2010 +0000

    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

diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 95e419d..effb41a 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' 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.

-- 
Libav/FFmpeg packaging