aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/parseutils.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-07 20:34:24 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-07 20:46:25 +0200
commit9c37c81246146ef45bba59546cc611a6e26a5b21 (patch)
tree93649b11f0eab88bffbba9bcf7d66282ad057b73 /libavutil/parseutils.h
parent0739179bfb002324eea20f1c44c5f586b6bd3e04 (diff)
parent27f274628234c1f934b9a6a6380ed567c1b4ceae (diff)
downloadffmpeg-9c37c81246146ef45bba59546cc611a6e26a5b21.tar.gz
Merge commit '27f274628234c1f934b9a6a6380ed567c1b4ceae'
* commit '27f274628234c1f934b9a6a6380ed567c1b4ceae': parseutils: Make av_small_strptime public Conflicts: doc/APIchanges libavformat/utils.c libavutil/parseutils.c libavutil/version.h See: 29e972f67c914d35417bc7368493d2617abdd26e Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/parseutils.h')
-rw-r--r--libavutil/parseutils.h38
1 files changed, 22 insertions, 16 deletions
diff --git a/libavutil/parseutils.h b/libavutil/parseutils.h
index c80f0de3de..e66d24b76e 100644
--- a/libavutil/parseutils.h
+++ b/libavutil/parseutils.h
@@ -146,40 +146,46 @@ const char *av_get_known_color_name(int color_idx, const uint8_t **rgb);
int av_parse_time(int64_t *timeval, const char *timestr, int duration);
/**
+ * Attempt to find a specific tag in a URL.
+ *
+ * syntax: '?tag1=val1&tag2=val2...'. Little URL decoding is done.
+ * Return 1 if found.
+ */
+int av_find_info_tag(char *arg, int arg_size, const char *tag1, const char *info);
+
+/**
+ * Simplified version of strptime
+ *
* Parse the input string p according to the format string fmt and
* store its results in the structure dt.
* This implementation supports only a subset of the formats supported
* by the standard strptime().
*
- * In particular it actually supports the parameters:
+ * The supported input field descriptors are listed below.
* - %H: the hour as a decimal number, using a 24-hour clock, in the
- * range '00' through '23'
+ * range '00' through '23'
* - %J: hours as a decimal number, in the range '0' through INT_MAX
* - %M: the minute as a decimal number, using a 24-hour clock, in the
- * range '00' through '59'
+ * range '00' through '59'
* - %S: the second as a decimal number, using a 24-hour clock, in the
- * range '00' through '59'
+ * range '00' through '59'
* - %Y: the year as a decimal number, using the Gregorian calendar
* - %m: the month as a decimal number, in the range '1' through '12'
* - %d: the day of the month as a decimal number, in the range '1'
- * through '31'
+ * through '31'
+ * - %T: alias for '%H:%M:%S'
* - %%: a literal '%'
*
- * @return a pointer to the first character not processed in this
- * function call, or NULL in case the function fails to match all of
- * the fmt string and therefore an error occurred
+ * @return a pointer to the first character not processed in this function
+ * call. In case the input string contains more characters than
+ * required by the format string the return value points right after
+ * the last consumed input character. In case the whole input string
+ * is consumed the return value points to the null byte at the end of
+ * the string. On failure NULL is returned.
*/
char *av_small_strptime(const char *p, const char *fmt, struct tm *dt);
/**
- * Attempt to find a specific tag in a URL.
- *
- * syntax: '?tag1=val1&tag2=val2...'. Little URL decoding is done.
- * Return 1 if found.
- */
-int av_find_info_tag(char *arg, int arg_size, const char *tag1, const char *info);
-
-/**
* Convert the decomposed UTC time in tm to a time_t value.
*/
time_t av_timegm(struct tm *tm);