From ee60e04c2c07b907bf72d1092c43b972c9c5e725 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 16 Feb 2011 08:52:37 +0000 Subject: Replace remaining uses of parse_date with av_parse_time. Signed-off-by: Mans Rullgard (cherry picked from commit 9fcae9735e3b97366dcee9ca3c2f6cf4faf6756f) --- ffserver.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'ffserver.c') 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; } -- cgit v1.2.3