summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2004-04-05 10:27:26 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-04-05 10:27:26 +0000
commit64c020a8aba838ea89d1517ff40ac66a847140b4 (patch)
treeb0b92ea7112e4c9d2c5850f807fa0437498b723d /ffmpeg.c
parente52788d06952635c8c4e6f8c510cf311847aa641 (diff)
10000l
Originally committed as revision 2966 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 664ecf794d..35a8fd0de8 100644
--- 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"