diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2012-09-16 15:22:31 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-09-17 12:45:56 +0200 |
| commit | 85c93d90dfae17d2ccff21aec5a55ca3029be83c (patch) | |
| tree | 82b77fc08319c51845ba7eff8928cc845af515af | |
| parent | 83438a0db3c61f06979d1c4159e5c85d52eda488 (diff) | |
| download | ffmpeg-85c93d90dfae17d2ccff21aec5a55ca3029be83c.tar.gz | |
lavu/parseutils: fix av_small_strptime() whitespace directive parsing
According to POSIX, strptime() should consume whitespaces in the date
string everytime a whitespace conversion specification is found in the
date format specification. Make av_small_strptime() conform with this
behavior.
In particular, should fix trac ticket #1739.
| -rw-r--r-- | libavutil/parseutils.c | 6 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c index 2440d27d64..8dc583c898 100644 --- a/libavutil/parseutils.c +++ b/libavutil/parseutils.c @@ -443,6 +443,12 @@ char *av_small_strptime(const char *p, const char *fmt, struct tm *dt) int c, val; for(;;) { + /* consume time string until a non whitespace char is found */ + while (isspace(*fmt)) { + while (isspace(*p)) + p++; + fmt++; + } c = *fmt++; if (c == '\0') { return (char *)p; diff --git a/libavutil/version.h b/libavutil/version.h index ac2c09d17d..3361069bdf 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -40,7 +40,7 @@ #define LIBAVUTIL_VERSION_MAJOR 51 #define LIBAVUTIL_VERSION_MINOR 73 -#define LIBAVUTIL_VERSION_MICRO 100 +#define LIBAVUTIL_VERSION_MICRO 101 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ |