diff options
author | Diego Biurrun <diego@biurrun.de> | 2011-07-02 14:47:34 +0200 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2011-07-14 04:09:49 +0200 |
commit | 96c1e6d40d389eeb628840030dfe340d762a7ac8 (patch) | |
tree | b66be319363b96162dea4f44073eba331e652d07 /libavutil | |
parent | 806212498ae6b333d0c85dbc9c750580da7c6838 (diff) | |
download | ffmpeg-96c1e6d40d389eeb628840030dfe340d762a7ac8.tar.gz |
doxygen: Make sure parameter names match between .c and .h files.
Diffstat (limited to 'libavutil')
-rw-r--r-- | libavutil/parseutils.c | 16 | ||||
-rw-r--r-- | libavutil/parseutils.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c index 9bac7ab9ce..a7a4518215 100644 --- a/libavutil/parseutils.c +++ b/libavutil/parseutils.c @@ -484,7 +484,7 @@ static time_t mktimegm(struct tm *tm) return t; } -int av_parse_time(int64_t *timeval, const char *datestr, int duration) +int av_parse_time(int64_t *timeval, const char *timestr, int duration) { const char *p; int64_t t; @@ -506,19 +506,19 @@ int av_parse_time(int64_t *timeval, const char *datestr, int duration) #undef time time_t now = time(0); - len = strlen(datestr); + len = strlen(timestr); if (len > 0) - lastch = datestr[len - 1]; + lastch = timestr[len - 1]; else lastch = '\0'; is_utc = (lastch == 'z' || lastch == 'Z'); memset(&dt, 0, sizeof(dt)); - p = datestr; + p = timestr; q = NULL; if (!duration) { - if (!strncasecmp(datestr, "now", len)) { + if (!strncasecmp(timestr, "now", len)) { *timeval = (int64_t) now * 1000000; return 0; } @@ -555,15 +555,15 @@ int av_parse_time(int64_t *timeval, const char *datestr, int duration) } } } else { - /* parse datestr as a duration */ + /* parse timestr as a duration */ if (p[0] == '-') { negative = 1; ++p; } - /* parse datestr as HH:MM:SS */ + /* parse timestr as HH:MM:SS */ q = small_strptime(p, time_fmt[0], &dt); if (!q) { - /* parse datestr as S+ */ + /* parse timestr as S+ */ dt.tm_sec = strtol(p, (char **)&q, 10); if (q == p) { /* the parsing didn't succeed */ diff --git a/libavutil/parseutils.h b/libavutil/parseutils.h index befbbb56a1..0d78b3ea3b 100644 --- a/libavutil/parseutils.h +++ b/libavutil/parseutils.h @@ -83,7 +83,7 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen, * January, 1970 up to the time of the parsed date. If timestr cannot * be successfully parsed, set *time to INT64_MIN. - * @param datestr a string representing a date or a duration. + * @param timestr a 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] |