[FFmpeg-cvslog] lavfi/xbr: undef PI if defined

Clément Bœsch git at videolan.org
Wed Mar 29 15:55:06 EEST 2017


ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sun Mar 26 20:51:14 2017 +0200| [46068070314d56f66b681796635d38d497ef3bda] | committer: Clément Bœsch

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=46068070314d56f66b681796635d38d497ef3bda
---

 libavfilter/vf_xbr.c | 4 ++++
 1 file changed, 4 insertions(+)

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 {



More information about the ffmpeg-cvslog mailing list