From 6789133a2228af2d929eb4458e635323cf58243c Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Date: Mon, 31 Mar 2025 17:01:51 +0200 Subject: [PATCH] swscale/swscale_unscaled: Actually use X2->RGBA64 conversions The conversion functions were added in e7382b4d0101f02e61fdf5ad2c48aca500bb413f, yet they were never really enabled. Found via -ffunction-sections and --gc-sections. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libswscale/swscale_unscaled.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 4959963b18..b84120549e 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -1901,7 +1901,8 @@ static rgbConvFn findRgbConvFn(SwsInternal *c) else if (CONV_IS(X2RGB10LE, BGR48BE) || CONV_IS(X2BGR10LE, RGB48BE)) conv = HAVE_BIGENDIAN ? x2rgb10tobgr48_nobswap : x2rgb10tobgr48_bswap; - else if (CONV_IS(X2RGB10LE, RGBA64LE) + } else if (isX2RGB(srcFormat) && isRGBA64(dstFormat)) { + if (CONV_IS(X2RGB10LE, RGBA64LE) || CONV_IS(X2BGR10LE, BGRA64LE)) conv = HAVE_BIGENDIAN ? x2rgb10to64_bswap : x2rgb10to64_nobswap; else if (CONV_IS(X2RGB10LE, RGBA64BE) -- 2.45.2