From 4568325a1810ea5d829230dc5e9ef0e56c51632f Mon Sep 17 00:00:00 2001
From: Roman Shaposhnik <roman@shaposhnik.org>
Date: Tue, 6 Apr 2004 06:31:12 +0000
Subject:    * making it possible to specify recording date and time in a
 stream

Originally committed as revision 2971 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 ffserver.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ffserver.c')

diff --git a/ffserver.c b/ffserver.c
index 20f2b23724..b81b5c8865 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -26,6 +26,7 @@
 #include <sys/poll.h>
 #include <errno.h>
 #include <sys/time.h>
+#undef time //needed because HAVE_AV_CONFIG_H is defined on top
 #include <time.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-- 
cgit v1.2.3