diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-16 11:52:37 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-18 21:52:31 +0300 |
| commit | ee60e04c2c07b907bf72d1092c43b972c9c5e725 (patch) | |
| tree | 6e1990916bc5cef78041d82323a01381fe8c304b /ffserver.c | |
| parent | 40c3fe2c0873feed2a345032205560c4a816271f (diff) | |
Replace remaining uses of parse_date with av_parse_time.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 9fcae9735e3b97366dcee9ca3c2f6cf4faf6756f)
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ffserver.c b/ffserver.c index 58d4112352..a2956d3df7 100644 --- a/ffserver.c +++ b/ffserver.c @@ -2136,9 +2136,8 @@ static int open_input_stream(HTTPContext *c, const char *info) buf_size = FFM_PACKET_SIZE; /* compute position (absolute time) */ if (find_info_tag(buf, sizeof(buf), "date", info)) { - stream_pos = parse_date(buf, 0); - if (stream_pos == INT64_MIN) - return -1; + if ((ret = av_parse_time(&stream_pos, buf, 0)) < 0) + return ret; } else if (find_info_tag(buf, sizeof(buf), "buffer", info)) { int prebuffer = strtol(buf, 0, 10); stream_pos = av_gettime() - prebuffer * (int64_t)1000000; @@ -2149,9 +2148,8 @@ static int open_input_stream(HTTPContext *c, const char *info) buf_size = 0; /* compute position (relative time) */ if (find_info_tag(buf, sizeof(buf), "date", info)) { - stream_pos = parse_date(buf, 1); - if (stream_pos == INT64_MIN) - return -1; + if ((ret = av_parse_time(&stream_pos, buf, 1)) < 0) + return ret; } else stream_pos = 0; } |