summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2007-03-27 21:47:03 +0000
committerMichael Niedermayer <michaelni@gmx.at>2007-03-27 21:47:03 +0000
commitc367d06702b3a9cb6b5cf02435f76c5dd5f321e7 (patch)
tree1a25060b56fbf78fecd6600f6f132b2553a8faa7
parent7975048628e0e9900797283da1a5b6d98757d3e4 (diff)
prevent exit missuse
Originally committed as revision 8536 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--cmdutils.c2
-rw-r--r--ffmpeg.c2
-rw-r--r--ffplay.c2
-rw-r--r--ffserver.c2
-rw-r--r--libavutil/internal.h1
5 files changed, 9 insertions, 0 deletions
diff --git a/cmdutils.c b/cmdutils.c
index 2c53d90daa..36ef1a9383 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -24,6 +24,8 @@
#include "cmdutils.h"
+#undef exit
+
void show_help_options(const OptionDef *options, const char *msg, int mask, int value)
{
const OptionDef *po;
diff --git a/ffmpeg.c b/ffmpeg.c
index b29fce231e..2ee0011180 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -55,6 +55,8 @@
#define INFINITY HUGE_VAL
#endif
+#undef exit
+
/* select an input stream for an output stream */
typedef struct AVStreamMap {
int file_index;
diff --git a/ffplay.c b/ffplay.c
index 1b919d0b3a..ebe31cd9b3 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -49,6 +49,8 @@
}
#endif
+#undef exit
+
//#define DEBUG_SYNC
#define MAX_VIDEOQ_SIZE (5 * 256 * 1024)
diff --git a/ffserver.c b/ffserver.c
index 83cd4e4cf1..3c576dfc45 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -47,6 +47,8 @@
#include "ffserver.h"
#include "random.h"
+#undef exit
+
/* maximum number of simultaneous HTTP connections */
#define HTTP_MAX_CONNECTIONS 2000
diff --git a/libavutil/internal.h b/libavutil/internal.h
index 74477b7629..eefbfa1e4a 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -251,6 +251,7 @@ if((y)<(x)){\
#define srand srand_is_forbidden_due_to_state_trashing
#define sprintf sprintf_is_forbidden_due_to_security_issues_use_snprintf
#define strcat strcat_is_forbidden_due_to_security_issues_use_pstrcat
+#define exit exit_is_forbidden
#if !(defined(LIBAVFORMAT_BUILD) || defined(_FRAMEHOOK_H))
#define printf please_use_av_log
#define fprintf please_use_av_log