Commit 5380c9af authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '98cab397'

* commit '98cab397':
  lavf: Fix variables constness in ff_iso8601_to_unix_time()
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 037c9c25 98cab397
...@@ -4086,7 +4086,7 @@ int ff_find_stream_index(AVFormatContext *s, int id) ...@@ -4086,7 +4086,7 @@ int ff_find_stream_index(AVFormatContext *s, int id)
int64_t ff_iso8601_to_unix_time(const char *datestr) int64_t ff_iso8601_to_unix_time(const char *datestr)
{ {
struct tm time1 = { 0 }, time2 = { 0 }; struct tm time1 = { 0 }, time2 = { 0 };
char *ret1, *ret2; const char *ret1, *ret2;
ret1 = av_small_strptime(datestr, "%Y - %m - %d %T", &time1); ret1 = av_small_strptime(datestr, "%Y - %m - %d %T", &time1);
ret2 = av_small_strptime(datestr, "%Y - %m - %dT%T", &time2); ret2 = av_small_strptime(datestr, "%Y - %m - %dT%T", &time2);
if (ret2 && !ret1) if (ret2 && !ret1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment