aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-06-22 22:54:32 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-06-22 22:54:32 +0000
commitfcd10c4f00861ed60906fba12b9610ef99ce8131 (patch)
tree0e1d0cd2d5ccea9a1eec7f7b6735b1bad063a517
parent82fd4f4a077aa0c1c6d7b775323f746a51009152 (diff)
downloadffmpeg-fcd10c4f00861ed60906fba12b9610ef99ce8131.tar.gz
Mention how "now" is interpreted in the parse_date() doxy.
Originally committed as revision 23725 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/avformat.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 71e241dad0..6b19e7425e 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1279,8 +1279,9 @@ attribute_deprecated int parse_frame_rate(int *frame_rate, int *frame_rate_base,
* @param datestr String representing a date or a duration.
* - If a date the syntax is:
* @code
- * [{YYYY-MM-DD|YYYYMMDD}[T|t| ]]{{HH[:MM[:SS[.m...]]]}|{HH[MM[SS[.m...]]]}}[Z|z]
+ * now|{[{YYYY-MM-DD|YYYYMMDD}[T|t| ]]{{HH[:MM[:SS[.m...]]]}|{HH[MM[SS[.m...]]]}}[Z|z]}
* @endcode
+ * 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