aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-09-02 22:53:54 +0200
committerAnton Khirnov <anton@khirnov.net>2011-09-11 17:30:04 +0200
commit1533c10286c21445f55f19d9d6711c5a7aeaa028 (patch)
tree3ad04a72071db2a3c79ed22878f735b8a749b2c4
parentb3dd2010afb46d5e91117067b5e9e1f9dcd18df8 (diff)
downloadffmpeg-1533c10286c21445f55f19d9d6711c5a7aeaa028.tar.gz
doc/avconv: remove documentation for removed 'timestamp' option
-rw-r--r--doc/avconv.texi12
1 files changed, 0 insertions, 12 deletions
diff --git a/doc/avconv.texi b/doc/avconv.texi
index a6d1c0ab4f..1bab785c28 100644
--- a/doc/avconv.texi
+++ b/doc/avconv.texi
@@ -148,18 +148,6 @@ The offset is added to the timestamps of the input files.
Specifying a positive offset means that the corresponding
streams are delayed by 'offset' seconds.
-@item -timestamp @var{time}
-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[:metadata_specifier] @var{key}=@var{value}
Set a metadata key/value pair.