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

Originally committed as revision 808 to svn://svn.ffmpeg.org/ffmpeg/trunk

2 files changed, 6 insertions, 6 deletions

diff --git a/ffmpeg.c b/ffmpeg.c
index 5414607117..1d8b65cee2 100644
--- a/ffmpeg.c
+++ b/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]);
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";