diff --git a/cmdutils.c b/cmdutils.c index f1edc685ed..a4306d04d1 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -46,8 +46,6 @@ #include #endif -#undef exit - const char **opt_names; static int opt_name_count; AVCodecContext *avcodec_opts[CODEC_TYPE_NB]; 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 #endif -#undef time //needed because HAVE_AV_CONFIG_H is defined on top #include #include "cmdutils.h" @@ -74,8 +73,6 @@ #undef NDEBUG #include -#undef exit - const char program_name[] = "FFmpeg"; const int program_birth_year = 2000; diff --git a/ffplay.c b/ffplay.c index 3c9c379dd7..bfe10bebd1 100644 --- a/ffplay.c +++ b/ffplay.c @@ -47,10 +47,6 @@ #undef main /* We don't want SDL to override our main() */ #endif -#undef exit -#undef printf -#undef fprintf - const char program_name[] = "FFplay"; const int program_birth_year = 2003; diff --git a/ffprobe.c b/ffprobe.c index 512777ccb9..b6ac061010 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -21,7 +21,6 @@ #include "config.h" -#undef HAVE_AV_CONFIG_H #include "libavformat/avformat.h" #include "libavcodec/avcodec.h" #include "libavcodec/opt.h" diff --git a/ffserver.c b/ffserver.c index 41081c3975..d7e4def6d4 100644 --- a/ffserver.c +++ b/ffserver.c @@ -47,7 +47,6 @@ #endif #include #include -#undef time //needed because HAVE_AV_CONFIG_H is defined on top #include #include #include @@ -57,8 +56,6 @@ #include "cmdutils.h" -#undef exit - const char program_name[] = "FFserver"; const int program_birth_year = 2000;