mirror of https://git.ffmpeg.org/ffmpeg.git
Replace remaining uses of parse_date with av_parse_time.
Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
parent
f6c7375a17
commit
9fcae9735e
10
ffserver.c
10
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;
|
||||
}
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
#include "libavutil/base64.h"
|
||||
#include "libavutil/avstring.h"
|
||||
#include "libavutil/intreadwrite.h"
|
||||
#include "libavutil/parseutils.h"
|
||||
#include "libavutil/random_seed.h"
|
||||
#include "avformat.h"
|
||||
|
||||
|
@ -99,11 +100,11 @@ static void rtsp_parse_range_npt(const char *p, int64_t *start, int64_t *end)
|
|||
*end = AV_NOPTS_VALUE;
|
||||
|
||||
get_word_sep(buf, sizeof(buf), "-", &p);
|
||||
*start = parse_date(buf, 1);
|
||||
av_parse_time(start, buf, 1);
|
||||
if (*p == '-') {
|
||||
p++;
|
||||
get_word_sep(buf, sizeof(buf), "-", &p);
|
||||
*end = parse_date(buf, 1);
|
||||
av_parse_time(end, buf, 1);
|
||||
}
|
||||
// av_log(NULL, AV_LOG_DEBUG, "Range Start: %lld\n", *start);
|
||||
// av_log(NULL, AV_LOG_DEBUG, "Range End: %lld\n", *end);
|
||||
|
|
Loading…
Reference in New Issue