From 85c93d90dfae17d2ccff21aec5a55ca3029be83c Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefasab@gmail.com>
Date: Sun, 16 Sep 2012 15:22:31 +0200
Subject: [PATCH] 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.
---
libavutil/parseutils.c | 6 ++++++
libavutil/version.h | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c
index 2440d27d643..8dc583c8984 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 ac2c09d17da..3361069bdfd 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, \
--
GitLab