Originally committed as revision 8536 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
@@ -24,6 +24,8 @@ | |||||
#include "cmdutils.h" | #include "cmdutils.h" | ||||
#undef exit | |||||
void show_help_options(const OptionDef *options, const char *msg, int mask, int value) | void show_help_options(const OptionDef *options, const char *msg, int mask, int value) | ||||
{ | { | ||||
const OptionDef *po; | const OptionDef *po; | ||||
@@ -55,6 +55,8 @@ | |||||
#define INFINITY HUGE_VAL | #define INFINITY HUGE_VAL | ||||
#endif | #endif | ||||
#undef exit | |||||
/* select an input stream for an output stream */ | /* select an input stream for an output stream */ | ||||
typedef struct AVStreamMap { | typedef struct AVStreamMap { | ||||
int file_index; | int file_index; | ||||
@@ -49,6 +49,8 @@ | |||||
} | } | ||||
#endif | #endif | ||||
#undef exit | |||||
//#define DEBUG_SYNC | //#define DEBUG_SYNC | ||||
#define MAX_VIDEOQ_SIZE (5 * 256 * 1024) | #define MAX_VIDEOQ_SIZE (5 * 256 * 1024) | ||||
@@ -47,6 +47,8 @@ | |||||
#include "ffserver.h" | #include "ffserver.h" | ||||
#include "random.h" | #include "random.h" | ||||
#undef exit | |||||
/* maximum number of simultaneous HTTP connections */ | /* maximum number of simultaneous HTTP connections */ | ||||
#define HTTP_MAX_CONNECTIONS 2000 | #define HTTP_MAX_CONNECTIONS 2000 | ||||
@@ -251,6 +251,7 @@ if((y)<(x)){\ | |||||
#define srand srand_is_forbidden_due_to_state_trashing | #define srand srand_is_forbidden_due_to_state_trashing | ||||
#define sprintf sprintf_is_forbidden_due_to_security_issues_use_snprintf | #define sprintf sprintf_is_forbidden_due_to_security_issues_use_snprintf | ||||
#define strcat strcat_is_forbidden_due_to_security_issues_use_pstrcat | #define strcat strcat_is_forbidden_due_to_security_issues_use_pstrcat | ||||
#define exit exit_is_forbidden | |||||
#if !(defined(LIBAVFORMAT_BUILD) || defined(_FRAMEHOOK_H)) | #if !(defined(LIBAVFORMAT_BUILD) || defined(_FRAMEHOOK_H)) | ||||
#define printf please_use_av_log | #define printf please_use_av_log | ||||
#define fprintf please_use_av_log | #define fprintf please_use_av_log | ||||