Merge commit '98cab39798
'
* commit '98cab39798
':
lavf: Fix variables constness in ff_iso8601_to_unix_time()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
5380c9afb9
1 changed files with 1 additions and 1 deletions
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue