summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2012-06-21 16:36:15 +0100
committerMans Rullgard <mans@mansr.com>2012-06-21 22:53:05 +0100
commitc19e0ebe532360aee043b5fb275257dc008968c3 (patch)
treea2a8178c17deed2b9ebeb1ae874a156683382195
parent1d01fee980edf60215acd94daf2533a9fefb9342 (diff)
downloadffmpeg-streaming-c19e0ebe532360aee043b5fb275257dc008968c3.zip
ffmpeg-streaming-c19e0ebe532360aee043b5fb275257dc008968c3.tar.gz
lavf: include libavutil/time.h instead of redeclaring av_gettime()
This avoids some warnings about redundant declarations. Signed-off-by: Mans Rullgard <mans@mansr.com>
-rw-r--r--libavformat/avformat.h8
1 files 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.
*
OpenPOWER on IntegriCloud