summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-03-07 22:18:37 +0000
committerMåns Rullgård <mans@mansr.com>2010-03-07 22:18:37 +0000
commit6580d5e377cf7a54589fd7dcb6c754ef271ad8d5 (patch)
tree0e1a7155bd2c0419e71299b015d2f89b617ad7de /ffmpeg.c
parent72c2bdebcff5610741d6e89cb6066ba2a88f59ac (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 'ffmpeg.c')
-rw-r--r--ffmpeg.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 25f4558f89..d5deacce9d 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -66,7 +66,6 @@
#elif HAVE_CONIO_H
#include <conio.h>
#endif
-#undef time //needed because HAVE_AV_CONFIG_H is defined on top
#include <time.h>
#include "cmdutils.h"
@@ -74,8 +73,6 @@
#undef NDEBUG
#include <assert.h>
-#undef exit
-
const char program_name[] = "FFmpeg";
const int program_birth_year = 2000;