projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e52788d
)
10000l
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 5 Apr 2004 10:27:26 +0000
(10:27 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 5 Apr 2004 10:27:26 +0000
(10:27 +0000)
Originally committed as revision 2966 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg.c
patch
|
blob
|
history
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"