From 2b0931b7b8e15cccc0d9db62a7d4bb4b8757d84c Mon Sep 17 00:00:00 2001 From: Niklas Haas Date: Sat, 4 Feb 2023 17:58:00 +0100 Subject: [PATCH] utils/libav: don't pollute namespace Prefix this #define --- src/include/libplacebo/utils/libav_internal.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/include/libplacebo/utils/libav_internal.h b/src/include/libplacebo/utils/libav_internal.h index 6000a922..0eed809f 100644 --- a/src/include/libplacebo/utils/libav_internal.h +++ b/src/include/libplacebo/utils/libav_internal.h @@ -37,7 +37,7 @@ #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(57, 8, 100) && \ defined(PL_HAVE_VULKAN) && defined(VK_API_VERSION_1_2) -# define HAVE_LAV_VULKAN +# define PL_HAVE_LAV_VULKAN # include # include #endif @@ -504,7 +504,7 @@ static inline bool pl_test_pixfmt(pl_gpu gpu, enum AVPixelFormat pixfmt) case AV_PIX_FMT_VAAPI: return gpu->import_caps.tex & PL_HANDLE_DMA_BUF; -#ifdef HAVE_LAV_VULKAN +#ifdef PL_HAVE_LAV_VULKAN case AV_PIX_FMT_VULKAN: return pl_vulkan_get(gpu); #endif @@ -933,7 +933,7 @@ static bool pl_map_avframe_derived(pl_gpu gpu, struct pl_frame *out, return false; } -#ifdef HAVE_LAV_VULKAN +#ifdef PL_HAVE_LAV_VULKAN static bool pl_acquire_avframe(pl_gpu gpu, struct pl_frame *frame) { const AVFrame *avframe = frame->user_data; @@ -1068,7 +1068,7 @@ static inline bool pl_map_avframe_internal(pl_gpu gpu, struct pl_frame *out, goto error; return true; -#ifdef HAVE_LAV_VULKAN +#ifdef PL_HAVE_LAV_VULKAN case AV_PIX_FMT_VULKAN: if (!pl_map_avframe_vulkan(gpu, out, frame)) goto error; @@ -1139,7 +1139,7 @@ static inline void pl_unmap_avframe(pl_gpu gpu, struct pl_frame *frame) if (!avframe) goto done; -#ifdef HAVE_LAV_VULKAN +#ifdef PL_HAVE_LAV_VULKAN if (avframe->format == AV_PIX_FMT_VULKAN) pl_unmap_avframe_vulkan(gpu, frame); #endif