diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 23:00:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 23:00:08 +0200 |
| commit | 5380c9afb9a2be04564aeef2c3ecf080a8cdf24a (patch) | |
| tree | 6feac92dad809bc8ea0a4249952b9a07bf5de5f3 /libavformat/utils.c | |
| parent | 037c9c25e6213852e33de5b6e00bbf9d26195938 (diff) | |
| parent | 98cab39798612dcaea4f9b6d1e7974bc60d84e13 (diff) | |
Merge commit '98cab39798612dcaea4f9b6d1e7974bc60d84e13'
* commit '98cab39798612dcaea4f9b6d1e7974bc60d84e13':
lavf: Fix variables constness in ff_iso8601_to_unix_time()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 2d1459d077..e213b8312a 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4086,7 +4086,7 @@ int ff_find_stream_index(AVFormatContext *s, int id) int64_t ff_iso8601_to_unix_time(const char *datestr) { struct tm time1 = { 0 }, time2 = { 0 }; - char *ret1, *ret2; + const char *ret1, *ret2; ret1 = av_small_strptime(datestr, "%Y - %m - %d %T", &time1); ret2 = av_small_strptime(datestr, "%Y - %m - %dT%T", &time2); if (ret2 && !ret1) |