diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-07 20:34:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-07 20:46:25 +0200 |
| commit | 9c37c81246146ef45bba59546cc611a6e26a5b21 (patch) | |
| tree | 93649b11f0eab88bffbba9bcf7d66282ad057b73 /libavformat/utils.c | |
| parent | 0739179bfb002324eea20f1c44c5f586b6bd3e04 (diff) | |
| parent | 27f274628234c1f934b9a6a6380ed567c1b4ceae (diff) | |
Merge commit '27f274628234c1f934b9a6a6380ed567c1b4ceae'
* commit '27f274628234c1f934b9a6a6380ed567c1b4ceae':
parseutils: Make av_small_strptime public
Conflicts:
doc/APIchanges
libavformat/utils.c
libavutil/parseutils.c
libavutil/version.h
See: 29e972f67c914d35417bc7368493d2617abdd26e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 122fc1fdc4..c6e4627bf3 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4079,8 +4079,8 @@ int64_t ff_iso8601_to_unix_time(const char *datestr) { struct tm time1 = { 0 }, time2 = { 0 }; char *ret1, *ret2; - ret1 = av_small_strptime(datestr, "%Y - %m - %d %H:%M:%S", &time1); - ret2 = av_small_strptime(datestr, "%Y - %m - %dT%H:%M:%S", &time2); + ret1 = av_small_strptime(datestr, "%Y - %m - %d %T", &time1); + ret2 = av_small_strptime(datestr, "%Y - %m - %dT%T", &time2); if (ret2 && !ret1) return av_timegm(&time2); else |