aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale
diff options
context:
space:
mode:
authorRémi Denis-Courmont <remi@remlab.net>2023-12-05 17:54:26 +0200
committerRémi Denis-Courmont <remi@remlab.net>2023-12-08 17:21:09 +0200
commitb3825bbe452c8e4f129fa90bba1fed0ee7b87d71 (patch)
tree022ae13a579e7e282a307e009e7ce983aa2704f9 /libswscale
parent0b9d009b4a85be31ed8ba1a9cece3b2db3e4d2f3 (diff)
downloadffmpeg-b3825bbe452c8e4f129fa90bba1fed0ee7b87d71.tar.gz
riscv: test for assembler support
This should fix the build on LLVM 16 and earlier, at the cost of turning all non-RVV optimisations off.
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/riscv/Makefile2
-rw-r--r--libswscale/riscv/rgb2rgb.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/libswscale/riscv/Makefile b/libswscale/riscv/Makefile
index 7b371d5a86..48afaf62aa 100644
--- a/libswscale/riscv/Makefile
+++ b/libswscale/riscv/Makefile
@@ -1,3 +1,3 @@
OBJS += riscv/rgb2rgb.o
-OBJS += riscv/rgb2rgb_rvb.o
+RV-OBJS += riscv/rgb2rgb_rvb.o
RVV-OBJS += riscv/rgb2rgb_rvv.o
diff --git a/libswscale/riscv/rgb2rgb.c b/libswscale/riscv/rgb2rgb.c
index 4fa1f5afd9..e751e11075 100644
--- a/libswscale/riscv/rgb2rgb.c
+++ b/libswscale/riscv/rgb2rgb.c
@@ -42,6 +42,7 @@ void ff_yuyvtoyuv422_rvv(uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
av_cold void rgb2rgb_init_riscv(void)
{
+#if HAVE_RV
int flags = av_get_cpu_flags();
#if (__riscv_xlen == 64)
@@ -61,4 +62,5 @@ av_cold void rgb2rgb_init_riscv(void)
}
}
#endif
+#endif
}