10000l

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

diff --git a/ffmpeg.c b/ffmpeg.c
index 664ecf7..35a8fd0 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -34,6 +34,7 @@
 #include <sys/select.h>
 #include <stdlib.h>
 #endif
+#undef time //needed because HAVE_AV_CONFIG_H is defined on top
 #include <time.h>
 
 #include "cmdutils.h"