mirror of
https://github.com/librempeg/librempeg
synced 2024-11-23 11:39:47 +00:00
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
This commit is contained in:
parent
72c2bdebcf
commit
6580d5e377
@ -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];
|
||||
|
3
ffmpeg.c
3
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;
|
||||
|
||||
|
4
ffplay.c
4
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;
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user