diff options
| author | Roman Shaposhnik <roman@shaposhnik.org> | 2004-04-06 06:31:12 +0000 |
|---|---|---|
| committer | Roman Shaposhnik <roman@shaposhnik.org> | 2004-04-06 06:31:12 +0000 |
| commit | 4568325a1810ea5d829230dc5e9ef0e56c51632f (patch) | |
| tree | 7285032dd6413a353e2832e33af8598a50ab60bc /ffserver.c | |
| parent | 8c266f0cb76b5f293f257227ba66f68c0914257d (diff) | |
| download | ffmpeg-4568325a1810ea5d829230dc5e9ef0e56c51632f.tar.gz | |
* making it possible to specify recording date and time in a stream
Originally committed as revision 2971 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 1 |
1 files changed, 1 insertions, 0 deletions
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> |