summaryrefslogtreecommitdiff
path: root/ffserver.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-02-16 08:52:37 +0000
committerMans Rullgard <mans@mansr.com>2011-02-16 23:39:57 +0000
commit9fcae9735e3b97366dcee9ca3c2f6cf4faf6756f (patch)
treebe6b570df0808009785c1b671469d39df393dbe8 /ffserver.c
parentf6c7375a175ac649558aefab14f3895b2cb469aa (diff)
Replace remaining uses of parse_date with av_parse_time.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'ffserver.c')
-rw-r--r--ffserver.c10
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;
}