xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-28 05:50:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lavfi/xbr: undef PI if defined

Browse Source 
This conflict with the DJGPP libc math.h which includes a PI macro (to
M_PI).

We cannot make DJGPP POSIX only (using -D_POSIX_SOURCE) to avoid this
kind of symbols conflicts due to the lack of both posix_memalign and
memalign (DJGPP non standard function) in that POSIX mode. We currently
rely on memalign for aligned heap allocation.
This commit is contained in:
Clément Bœsch 2017-03-26 20:51:14 +02:00
parent 4ea8f57548
commit 4606807031
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/vf_xbr.c
View File

@ -37,6 +37,10 @@
#define RED_BLUE_MASK 0x00FF00FF #define RED_BLUE_MASK 0x00FF00FF
#define GREEN_MASK 0x0000FF00 #define GREEN_MASK 0x0000FF00
#ifdef PI
#undef PI
#endif
typedef int (*xbrfunc_t)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs); typedef int (*xbrfunc_t)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs);
typedef struct { typedef struct {