Browse Source

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
tags/v0.6
Måns Rullgård 15 years ago
parent
commit
6580d5e377
5 changed files with 0 additions and 13 deletions
  1. +0
    -2
      cmdutils.c
  2. +0
    -3
      ffmpeg.c
  3. +0
    -4
      ffplay.c
  4. +0
    -1
      ffprobe.c
  5. +0
    -3
      ffserver.c

+ 0
- 2
cmdutils.c View File

@@ -46,8 +46,6 @@
#include <sys/resource.h> #include <sys/resource.h>
#endif #endif


#undef exit

const char **opt_names; const char **opt_names;
static int opt_name_count; static int opt_name_count;
AVCodecContext *avcodec_opts[CODEC_TYPE_NB]; AVCodecContext *avcodec_opts[CODEC_TYPE_NB];


+ 0
- 3
ffmpeg.c View File

@@ -66,7 +66,6 @@
#elif HAVE_CONIO_H #elif HAVE_CONIO_H
#include <conio.h> #include <conio.h>
#endif #endif
#undef time //needed because HAVE_AV_CONFIG_H is defined on top
#include <time.h> #include <time.h>


#include "cmdutils.h" #include "cmdutils.h"
@@ -74,8 +73,6 @@
#undef NDEBUG #undef NDEBUG
#include <assert.h> #include <assert.h>


#undef exit

const char program_name[] = "FFmpeg"; const char program_name[] = "FFmpeg";
const int program_birth_year = 2000; const int program_birth_year = 2000;




+ 0
- 4
ffplay.c View File

@@ -47,10 +47,6 @@
#undef main /* We don't want SDL to override our main() */ #undef main /* We don't want SDL to override our main() */
#endif #endif


#undef exit
#undef printf
#undef fprintf

const char program_name[] = "FFplay"; const char program_name[] = "FFplay";
const int program_birth_year = 2003; const int program_birth_year = 2003;




+ 0
- 1
ffprobe.c View File

@@ -21,7 +21,6 @@


#include "config.h" #include "config.h"


#undef HAVE_AV_CONFIG_H
#include "libavformat/avformat.h" #include "libavformat/avformat.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavcodec/opt.h" #include "libavcodec/opt.h"


+ 0
- 3
ffserver.c View File

@@ -47,7 +47,6 @@
#endif #endif
#include <errno.h> #include <errno.h>
#include <sys/time.h> #include <sys/time.h>
#undef time //needed because HAVE_AV_CONFIG_H is defined on top
#include <time.h> #include <time.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <signal.h> #include <signal.h>
@@ -57,8 +56,6 @@


#include "cmdutils.h" #include "cmdutils.h"


#undef exit

const char program_name[] = "FFserver"; const char program_name[] = "FFserver";
const int program_birth_year = 2000; const int program_birth_year = 2000;




Loading…
Cancel
Save