apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-22 08:31:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

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";