diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 13:25:23 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 13:34:45 +0100 |
commit | 99efd596267248ba5eae1b0e540d880368a402c3 (patch) | |
tree | 1ab9b0250d1350ffaae7d5f2bf98ba78e21d0cf4 /libavutil/internal.h | |
parent | 1fa2bdc90a4a5309a3bf83ff9ae37f59e5f329fa (diff) | |
parent | cb45553f577f8e0ebfe05d3287e1b6fa5859b967 (diff) | |
download | ffmpeg-99efd596267248ba5eae1b0e540d880368a402c3.tar.gz |
Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'
* commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967':
Remove pointless #undefs of previously forbidden functions.
fate: Add dependencies for bmp, cdxl, dfa, mp3
Conflicts:
doc/examples/muxing.c
libavfilter/filtfmts.c
libavutil/des.c
libavutil/eval.c
libavutil/log.c
libavutil/parseutils.c
tests/fate/mp3.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/internal.h')
-rw-r--r-- | libavutil/internal.h | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/libavutil/internal.h b/libavutil/internal.h index cc977f64da..4400c5c439 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -58,38 +58,6 @@ # define INT_BIT (CHAR_BIT * sizeof(int)) #endif -/* avoid usage of dangerous/inappropriate system functions */ -#undef malloc -#define malloc please_use_av_malloc -#undef free -#define free please_use_av_free -#undef realloc -#define realloc please_use_av_realloc -#undef rand -#define rand rand_is_forbidden_due_to_state_trashing_use_av_lfg_get -#undef srand -#define srand srand_is_forbidden_due_to_state_trashing_use_av_lfg_init -#undef random -#define random random_is_forbidden_due_to_state_trashing_use_av_lfg_get -#undef sprintf -#define sprintf sprintf_is_forbidden_due_to_security_issues_use_snprintf -#undef strcat -#define strcat strcat_is_forbidden_due_to_security_issues_use_av_strlcat -#undef exit -#define exit exit_is_forbidden -#undef printf -#define printf please_use_av_log_instead_of_printf -#undef fprintf -#define fprintf please_use_av_log_instead_of_fprintf -#undef puts -#define puts please_use_av_log_instead_of_puts -#undef perror -#define perror please_use_av_log_instead_of_perror -#undef strcasecmp -#define strcasecmp please_use_av_strcasecmp -#undef strncasecmp -#define strncasecmp please_use_av_strncasecmp - #define FF_ALLOC_OR_GOTO(ctx, p, size, label)\ {\ p = av_malloc(size);\ |