Merge commit '7f29644108c5fbd80f160930b31b78b8704c1a49'

[ffmpeg] / libavutil / parseutils.c

diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c
index e793e2d4c6a3e239aa64d0e55d1f46e8ebafe0e9..ba4b4e1b722f8c8ace520a3317cbdef68c4ae58d 100644 (file)
--- a/libavutil/parseutils.c
+++ b/libavutil/parseutils.c
@@ -613,12 +613,14 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration)
             dt.tm_hour = 0;
         }
         if (!q) {
+            char *o;
             /* parse timestr as S+ */
-            dt.tm_sec = strtol(p, (void *)&q, 10);
-            if (q == p) /* the parsing didn't succeed */
+            dt.tm_sec = strtol(p, &o, 10);
+            if (o == p) /* the parsing didn't succeed */
                 return AVERROR(EINVAL);
             dt.tm_min = 0;
             dt.tm_hour = 0;
+            q = o;
         }
     }