summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavutil/parseutils.c6
-rw-r--r--libavutil/version.h2
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, \