Browse Source

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

Originally committed as revision 808 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Fabrice Bellard 23 years ago
parent
commit
2c4ae653af
2 changed files with 6 additions and 6 deletions
  1. +3
    -3
      ffmpeg.c
  2. +3
    -3
      ffserver.c

+ 3
- 3
ffmpeg.c View File

@@ -890,7 +890,7 @@ static int av_encode(AVFormatContext **output_files,
#endif #endif
term_init(); term_init();


start_time = gettime();
start_time = av_gettime();
min_pts = 0; min_pts = 0;
stream_no_data = 0; stream_no_data = 0;
key = -1; key = -1;
@@ -1959,7 +1959,7 @@ INT64 getutime(void)
#else #else
INT64 getutime(void) INT64 getutime(void)
{ {
return gettime();
return av_gettime();
} }
#endif #endif


@@ -2134,7 +2134,7 @@ int main(int argc, char **argv)
const OptionDef *po; const OptionDef *po;
INT64 ti; INT64 ti;
register_all();
av_register_all();


/* detect if invoked as player */ /* detect if invoked as player */
i = strlen(argv[0]); i = strlen(argv[0]);


+ 3
- 3
ffserver.c View File

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


register_all();
av_register_all();


config_filename = "/etc/ffserver.conf"; config_filename = "/etc/ffserver.conf";




Loading…
Cancel
Save