diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-12 19:11:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-12 19:12:33 +0100 |
| commit | a435a0337419e7080115a51c283ab0fbbd0ae83f (patch) | |
| tree | 2abb15d3e14d9829187a2f3fe508d2f89cd7744c | |
| parent | d780fdb904a4a3f555252fad6b898534c9af128b (diff) | |
| parent | 6b45f05ef5b241fd1513702119af9c30056a0ac5 (diff) | |
| download | ffmpeg-a435a0337419e7080115a51c283ab0fbbd0ae83f.tar.gz | |
Merge commit '6b45f05ef5b241fd1513702119af9c30056a0ac5'
* commit '6b45f05ef5b241fd1513702119af9c30056a0ac5':
parseutils: fix discarding const attribute warning
Conflicts:
libavutil/parseutils.c
See: fe87b2e79c734a111747a239943c7340f8d3f7d7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/parseutils.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c index e793e2d4c6..ba4b4e1b72 100644 --- 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; } } |