Browse Source

Merge commit '98cab39798612dcaea4f9b6d1e7974bc60d84e13'

* commit '98cab39798612dcaea4f9b6d1e7974bc60d84e13':
  lavf: Fix variables constness in ff_iso8601_to_unix_time()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.7
Michael Niedermayer 10 years ago
parent
commit
5380c9afb9
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      libavformat/utils.c

+ 1
- 1
libavformat/utils.c View File

@@ -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…
Cancel
Save