[FFmpeg-cvslog] lavf: include libavutil/time.h instead of redeclaring av_gettime()

Mans Rullgard git at videolan.org
Fri Jun 22 22:36:33 CEST 2012


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Thu Jun 21 16:36:15 2012 +0100| [c19e0ebe532360aee043b5fb275257dc008968c3] | committer: Mans Rullgard

lavf: include libavutil/time.h instead of redeclaring av_gettime()

This avoids some warnings about redundant declarations.

Signed-off-by: Mans Rullgard <mans at mansr.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c19e0ebe532360aee043b5fb275257dc008968c3
---

 libavformat/avformat.h |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 1c1aad6..e292206 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -201,6 +201,10 @@
 #include "avio.h"
 #include "libavformat/version.h"
 
+#if FF_API_AV_GETTIME
+#include "libavutil/time.h"
+#endif
+
 struct AVFormatContext;
 
 
@@ -1635,10 +1639,6 @@ void av_dump_format(AVFormatContext *ic,
                     const char *url,
                     int is_output);
 
-#if FF_API_AV_GETTIME
-int64_t av_gettime(void);
-#endif
-
 /**
  * Return in 'buf' the path with '%d' replaced by a number.
  *



More information about the ffmpeg-cvslog mailing list