diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-03-07 22:18:37 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-03-07 22:18:37 +0000 |
| commit | 6580d5e377cf7a54589fd7dcb6c754ef271ad8d5 (patch) | |
| tree | 0e1a7155bd2c0419e71299b015d2f89b617ad7de /ffserver.c | |
| parent | 72c2bdebcff5610741d6e89cb6066ba2a88f59ac (diff) | |
Remove hacks not required since HAVE_AV_CONFIG_H was unset for the apps
Originally committed as revision 22295 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/ffserver.c b/ffserver.c index 41081c3975..d7e4def6d4 100644 --- a/ffserver.c +++ b/ffserver.c @@ -47,7 +47,6 @@ #endif #include <errno.h> #include <sys/time.h> -#undef time //needed because HAVE_AV_CONFIG_H is defined on top #include <time.h> #include <sys/wait.h> #include <signal.h> @@ -57,8 +56,6 @@ #include "cmdutils.h" -#undef exit - const char program_name[] = "FFserver"; const int program_birth_year = 2000; |