Module: libav
Branch: master
Commit: 5e3f6dc70198426fe0741e3017826b8bf3ee5ad8
Author: Derek Buitenhuis <derek.buitenh...@gmail.com>
Committer: Luca Barbato <lu_z...@gentoo.org>
Date: Thu Aug 24 21:04:13 2017 +0100
swscale: Do not expand a macro with 'defined' in it
Fixes:
libswscale/utils.c:1632:5: warning: macro expansion producing 'defined' has
undefined behavior [-Wexpansion-to-defined]
#if USE_MMAP
^
libswscale/utils.c:1577:49: note: expanded from macro 'USE_MMAP'
#define USE_MMAP (HAVE_MMAP && HAVE_MPROTECT && defined MAP_ANONYMOUS)
^
Signed-off-by: Derek Buitenhuis <derek.buitenh...@gmail.com>
Signed-off-by: Luca Barbato <lu_z...@gentoo.org>
---
libswscale/utils.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/libswscale/utils.c b/libswscale/utils.c
index 6b17955..786774f 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -1098,7 +1098,11 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter
*srcFilter,
}
}
-#define USE_MMAP (HAVE_MMAP && HAVE_MPROTECT && defined MAP_ANONYMOUS)
+#if HAVE_MMAP && HAVE_MPROTECT && defined(MAP_ANONYMOUS)
+#define USE_MMAP 1
+#else
+#define USE_MMAP 0
+#endif
/* precalculate horizontal scaler filter coefficients */
{
_______________________________________________
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
