diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-26 20:51:14 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-29 14:49:29 +0200 |
| commit | 46068070314d56f66b681796635d38d497ef3bda (patch) | |
| tree | 2d3cdd53bd808e356aae11397df635067533e752 /libavfilter | |
| parent | 4ea8f57548f36b0104bc372b2a6d3d4eaae0ce70 (diff) | |
| download | ffmpeg-streaming-46068070314d56f66b681796635d38d497ef3bda.zip ffmpeg-streaming-46068070314d56f66b681796635d38d497ef3bda.tar.gz | |
lavfi/xbr: undef PI if defined
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.
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vf_xbr.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavfilter/vf_xbr.c b/libavfilter/vf_xbr.c index 9893e0c..d0d5104 100644 --- a/libavfilter/vf_xbr.c +++ b/libavfilter/vf_xbr.c @@ -37,6 +37,10 @@ #define RED_BLUE_MASK 0x00FF00FF #define GREEN_MASK 0x0000FF00 +#ifdef PI +#undef PI +#endif + typedef int (*xbrfunc_t)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs); typedef struct { |
