mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-06-03 18:37:46 +00:00
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:
parent
910fdd21b5
commit
2c4ae653af
2 changed files with 6 additions and 6 deletions
6
ffmpeg.c
6
ffmpeg.c
|
@ -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]);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue