diff options
| author | Fabrice Bellard <fabrice@bellard.org> | 2002-07-25 16:07:39 +0000 |
|---|---|---|
| committer | Fabrice Bellard <fabrice@bellard.org> | 2002-07-25 16:07:39 +0000 |
| commit | 2c4ae653afbd5903976b69f0306331daa3d5d2f6 (patch) | |
| tree | 072e94a56050da08288159c86007acec949b0a70 /ffserver.c | |
| parent | 910fdd21b59645cb833ae3b16ee3ffc14d51b2d6 (diff) | |
| download | ffmpeg-2c4ae653afbd5903976b69f0306331daa3d5d2f6.tar.gz | |
renamed gettime() av_gettime() - same for register_all()
Originally committed as revision 808 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ffserver.c b/ffserver.c index e11f8763bb..d2390f27ea 100644 --- a/ffserver.c +++ b/ffserver.c @@ -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"; |