OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
35686a2
)
parseutils: fix discarding const attribute warning
author
Vittorio Giovara
<vittorio.giovara@gmail.com>
Tue, 3 Dec 2013 11:57:51 +0000
(12:57 +0100)
committer
Vittorio Giovara
<vittorio.giovara@gmail.com>
Thu, 12 Dec 2013 15:10:14 +0000
(16:10 +0100)
libavutil/parseutils.c
patch
|
blob
|
history
diff --git
a/libavutil/parseutils.c
b/libavutil/parseutils.c
index
0e3fd9e
..
414cd47
100644
(file)
--- a/
libavutil/parseutils.c
+++ b/
libavutil/parseutils.c
@@
-555,15
+555,17
@@
int av_parse_time(int64_t *timeval, const char *timestr, int duration)
/* parse timestr as HH:MM:SS */
q = small_strptime(p, time_fmt[0], &dt);
if (!q) {
+ char *o;
/* parse timestr as S+ */
- dt.tm_sec = strtol(p,
(char **)&q
, 10);
- if (
q
== p) {
+ dt.tm_sec = strtol(p,
&o
, 10);
+ if (
o
== p) {
/* the parsing didn't succeed */
*timeval = INT64_MIN;
return AVERROR(EINVAL);
}
dt.tm_min = 0;
dt.tm_hour = 0;
+ q = o;
}
}