diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2012-09-01 13:32:43 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-09-06 00:40:01 +0200 |
| commit | 29e972f67c914d35417bc7368493d2617abdd26e (patch) | |
| tree | 4d138efbd74711b03eaf34d51761604dcecbe2cd /libavformat/utils.c | |
| parent | 79dcd58d839714e8e645fd4414ee4c3645bc419e (diff) | |
| download | ffmpeg-29e972f67c914d35417bc7368493d2617abdd26e.tar.gz | |
lavu/parseutils: add av_small_strptime()
Make internal small_strptime() function public, and use it in place of
strptime().
This allows to avoid a dependency on strptime() on systems which do not
support it.
In particular, fix trac ticket #992.
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 9b251c7a46..01b5cc512b 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4478,20 +4478,14 @@ void ff_make_absolute_url(char *buf, int size, const char *base, int64_t ff_iso8601_to_unix_time(const char *datestr) { -#if HAVE_STRPTIME struct tm time1 = {0}, time2 = {0}; char *ret1, *ret2; - ret1 = strptime(datestr, "%Y - %m - %d %T", &time1); - ret2 = strptime(datestr, "%Y - %m - %dT%T", &time2); + ret1 = av_small_strptime(datestr, "%Y - %m - %d %H:%M:%S", &time1); + ret2 = av_small_strptime(datestr, "%Y - %m - %dT%H:%M:%S", &time2); if (ret2 && !ret1) return av_timegm(&time2); else return av_timegm(&time1); -#else - av_log(NULL, AV_LOG_WARNING, "strptime() unavailable on this system, cannot convert " - "the date string.\n"); - return 0; -#endif } int avformat_query_codec(AVOutputFormat *ofmt, enum AVCodecID codec_id, int std_compliance) |