RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

renamed gettime() av_gettime() - same for register_all() 

Originally committed as revision 808 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Fabrice Bellard 2002-07-25 16:07:39 +00:00
parent 910fdd21b5
commit 2c4ae653af
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ffmpeg.c
View File

@ -890,7 +890,7 @@ static int av_encode(AVFormatContext **output_files,
#endif
term_init();
start_time = gettime();
start_time = av_gettime();
min_pts = 0;
stream_no_data = 0;
key = -1;
@ -1959,7 +1959,7 @@ INT64 getutime(void)
#else
INT64 getutime(void)
{
return gettime();
return av_gettime();
}
#endif
@ -2134,7 +2134,7 @@ int main(int argc, char **argv)
const OptionDef *po;
INT64 ti;
register_all();
av_register_all();
/* detect if invoked as player */
i = strlen(argv[0]);

6
ffserver.c
View File

@ -1430,9 +1430,9 @@ static int open_input_stream(HTTPContext *c, const char *info)
stream_pos = parse_date(buf, 0);
} else if (find_info_tag(buf, sizeof(buf), "buffer", info)) {
int prebuffer = strtol(buf, 0, 10);
stream_pos = gettime() - prebuffer * 1000000;
stream_pos = av_gettime() - prebuffer * 1000000;
} else {
stream_pos = gettime() - c->stream->prebuffer * 1000;
stream_pos = av_gettime() - c->stream->prebuffer * 1000;
}
} else {
strcpy(input_filename, c->stream->feed_filename);
@ -2585,7 +2585,7 @@ int main(int argc, char **argv)
int c;
struct sigaction sigact;
register_all();
av_register_all();
config_filename = "/etc/ffserver.conf";