Commit 3217731f authored by mru's avatar mru

Remove hacks not required since HAVE_AV_CONFIG_H was unset for the apps

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@22295 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent f6ae4261
......@@ -46,8 +46,6 @@
#include <sys/resource.h>
#endif
#undef exit
const char **opt_names;
static int opt_name_count;
AVCodecContext *avcodec_opts[CODEC_TYPE_NB];
......
......@@ -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;
......
......@@ -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;
......
......@@ -21,7 +21,6 @@
#include "config.h"
#undef HAVE_AV_CONFIG_H
#include "libavformat/avformat.h"
#include "libavcodec/avcodec.h"
#include "libavcodec/opt.h"
......
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment