[FFmpeg-cvslog] r22295 - in trunk: cmdutils.c ffmpeg.c ffplay.c ffprobe.c ffserver.c

[mru]

Author: mru
Date: Sun Mar  7 23:18:37 2010
New Revision: 22295

Log:
Remove hacks not required since HAVE_AV_CONFIG_H was unset for the apps

Modified:
   trunk/cmdutils.c
   trunk/ffmpeg.c
   trunk/ffplay.c
   trunk/ffprobe.c
   trunk/ffserver.c

Modified: trunk/cmdutils.c
==============================================================================
--- trunk/cmdutils.c	Sun Mar  7 23:18:33 2010	(r22294)
+++ trunk/cmdutils.c	Sun Mar  7 23:18:37 2010	(r22295)
@@ -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];

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Sun Mar  7 23:18:33 2010	(r22294)
+++ trunk/ffmpeg.c	Sun Mar  7 23:18:37 2010	(r22295)
@@ -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;
 

Modified: trunk/ffplay.c
==============================================================================
--- trunk/ffplay.c	Sun Mar  7 23:18:33 2010	(r22294)
+++ trunk/ffplay.c	Sun Mar  7 23:18:37 2010	(r22295)
@@ -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;
 

Modified: trunk/ffprobe.c
==============================================================================
--- trunk/ffprobe.c	Sun Mar  7 23:18:33 2010	(r22294)
+++ trunk/ffprobe.c	Sun Mar  7 23:18:37 2010	(r22295)
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#undef HAVE_AV_CONFIG_H
 #include "libavformat/avformat.h"
 #include "libavcodec/avcodec.h"
 #include "libavcodec/opt.h"

Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c	Sun Mar  7 23:18:33 2010	(r22294)
+++ trunk/ffserver.c	Sun Mar  7 23:18:37 2010	(r22295)
@@ -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;