[FFmpeg-cvslog] doc/ffmpeg: reference time syntax sections in ffmpeg-utils for itsoffset and timestamp options

[Stefano Sabatini]

ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Thu Jan 23 18:41:57 2014 +0100| [433b153b681db591a8653f5d11a4fa62276e2a71] | committer: Stefano Sabatini

doc/ffmpeg: reference time syntax sections in ffmpeg-utils for itsoffset and timestamp options

Avoid doc duplication and desynching.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=433b153b681db591a8653f5d11a4fa62276e2a71
---

 doc/ffmpeg.texi |   27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index fa5f8b5..949af75 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -285,23 +285,20 @@ input until the timestamps reach @var{position}.
 @var{position} may be either in seconds or in @code{hh:mm:ss[.xxx]} form.
 
 @item -itsoffset @var{offset} (@emph{input})
-Set the input time offset in seconds.
- at code{[-]hh:mm:ss[.xxx]} syntax is also supported.
-The offset is added to the timestamps of the input files.
-Specifying a positive offset means that the corresponding
-streams are delayed by @var{offset} seconds.
+Set the input time offset.
 
- at item -timestamp @var{time} (@emph{output})
+ at var{offset} must be a time duration specification,
+see @ref{time duration syntax,,the Time duration section in the ffmpeg-utils(1) manual,ffmpeg-utils}.
+
+The offset is added to the timestamps of the input files. Specifying
+a positive offset means that the corresponding streams are delayed by
+the time duration specified in @var{offset}.
+
+ at item -timestamp @var{date} (@emph{output})
 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...])|(HHMMSS[.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.
+
+ at var{date} must be a time duration specification,
+see @ref{date syntax,,the Date section in the ffmpeg-utils(1) manual,ffmpeg-utils}.
 
 @item -metadata[:metadata_specifier] @var{key}=@var{value} (@emph{output,per-metadata})
 Set a metadata key/value pair.