This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 5b39be1f0aa803634f649de3c2bfa2b25aaf4323 Author: Niklas Haas <[email protected]> AuthorDate: Wed Mar 4 11:51:27 2026 +0100 Commit: Niklas Haas <[email protected]> CommitDate: Wed Mar 4 11:53:10 2026 +0100 swscale: fix build on --disable-unstable By excluding the Vulkan makefile entirely when --disable-unstable is passed. This also correctly avoids compiling e.g. unused GLSL compilers. Fixes: #22295 See-Also: #22366 Sponsored-by: Sovereign Tech Fund Signed-off-by: Niklas Haas <[email protected]> --- libswscale/Makefile | 2 ++ libswscale/swscale.c | 2 +- libswscale/utils.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libswscale/Makefile b/libswscale/Makefile index 4331768cfa..c8119e4f43 100644 --- a/libswscale/Makefile +++ b/libswscale/Makefile @@ -33,7 +33,9 @@ OBJS-$(CONFIG_UNSTABLE) += \ ops_memcpy.o \ ops_optimizer.o \ +ifeq ($(CONFIG_UNSTABLE),yes) include $(SRC_PATH)/libswscale/vulkan/Makefile +endif # Objects duplicated from other libraries for shared builds SHLIBOBJS += log2_tab.o half2float.o diff --git a/libswscale/swscale.c b/libswscale/swscale.c index b04df78a5d..94d9102f97 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -1442,7 +1442,7 @@ int sws_frame_setup(SwsContext *ctx, const AVFrame *dst, const AVFrame *src) if (dev_ctx->type != AV_HWDEVICE_TYPE_VULKAN) return AVERROR(ENOTSUP); -#if CONFIG_VULKAN +#if CONFIG_UNSTABLE && CONFIG_VULKAN ret = ff_sws_vk_init(ctx, src_hwfc->device_ref); if (ret < 0) return ret; diff --git a/libswscale/utils.c b/libswscale/utils.c index f693f9c2db..4f50586e90 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -2248,7 +2248,7 @@ void sws_freeContext(SwsContext *sws) if (!c) return; -#if CONFIG_VULKAN +#if CONFIG_UNSTABLE && CONFIG_VULKAN ff_sws_vk_uninit(sws); #endif _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
