[SCM] libav/experimental: Mention how "now" is interpreted in the parse_date() doxy.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:09:04 UTC 2013
The following commit has been merged in the experimental branch:
commit fcd10c4f00861ed60906fba12b9610ef99ce8131
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date: Tue Jun 22 22:54:32 2010 +0000
Mention how "now" is interpreted in the parse_date() doxy.
Originally committed as revision 23725 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 71e241d..6b19e74 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
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list