[FFmpeg-devel] [PATCH v2 1/2] avcodec/vvcdec: remove vvc prefix for x86 and riscv

[Nuo Mi]

---
 libavcodec/riscv/vvc/Makefile                      |  6 +++---
 libavcodec/riscv/vvc/{vvcdsp_init.c => dsp_init.c} |  0
 libavcodec/riscv/vvc/{vvc_mc_rvv.S => mc_rvv.S}    |  0
 libavcodec/riscv/vvc/{vvc_sad_rvv.S => sad_rvv.S}  |  0
 libavcodec/x86/vvc/Makefile                        | 12 ++++++------
 libavcodec/x86/vvc/{vvc_alf.asm => alf.asm}        |  0
 libavcodec/x86/vvc/{vvc_dmvr.asm => dmvr.asm}      |  0
 libavcodec/x86/vvc/{vvcdsp_init.c => dsp_init.c}   |  0
 libavcodec/x86/vvc/{vvc_mc.asm => mc.asm}          |  0
 libavcodec/x86/vvc/{vvc_of.asm => of.asm}          |  0
 libavcodec/x86/vvc/{vvc_sad.asm => sad.asm}        |  0
 11 files changed, 9 insertions(+), 9 deletions(-)
 rename libavcodec/riscv/vvc/{vvcdsp_init.c => dsp_init.c} (100%)
 rename libavcodec/riscv/vvc/{vvc_mc_rvv.S => mc_rvv.S} (100%)
 rename libavcodec/riscv/vvc/{vvc_sad_rvv.S => sad_rvv.S} (100%)
 rename libavcodec/x86/vvc/{vvc_alf.asm => alf.asm} (100%)
 rename libavcodec/x86/vvc/{vvc_dmvr.asm => dmvr.asm} (100%)
 rename libavcodec/x86/vvc/{vvcdsp_init.c => dsp_init.c} (100%)
 rename libavcodec/x86/vvc/{vvc_mc.asm => mc.asm} (100%)
 rename libavcodec/x86/vvc/{vvc_of.asm => of.asm} (100%)
 rename libavcodec/x86/vvc/{vvc_sad.asm => sad.asm} (100%)

diff --git a/libavcodec/riscv/vvc/Makefile b/libavcodec/riscv/vvc/Makefile
index 6b9c618b33..e17ab93ab8 100644
--- a/libavcodec/riscv/vvc/Makefile
+++ b/libavcodec/riscv/vvc/Makefile
@@ -1,3 +1,3 @@
-OBJS-$(CONFIG_VVC_DECODER) += riscv/vvc/vvcdsp_init.o
-RVV-OBJS-$(CONFIG_VVC_DECODER) += riscv/vvc/vvc_mc_rvv.o \
-                                  riscv/vvc/vvc_sad_rvv.o
+OBJS-$(CONFIG_VVC_DECODER)     += riscv/vvc/dsp_init.o
+RVV-OBJS-$(CONFIG_VVC_DECODER) += riscv/vvc/mc_rvv.o    \
+                                  riscv/vvc/sad_rvv.o
diff --git a/libavcodec/riscv/vvc/vvcdsp_init.c b/libavcodec/riscv/vvc/dsp_init.c
similarity index 100%
rename from libavcodec/riscv/vvc/vvcdsp_init.c
rename to libavcodec/riscv/vvc/dsp_init.c
diff --git a/libavcodec/riscv/vvc/vvc_mc_rvv.S b/libavcodec/riscv/vvc/mc_rvv.S
similarity index 100%
rename from libavcodec/riscv/vvc/vvc_mc_rvv.S
rename to libavcodec/riscv/vvc/mc_rvv.S
diff --git a/libavcodec/riscv/vvc/vvc_sad_rvv.S b/libavcodec/riscv/vvc/sad_rvv.S
similarity index 100%
rename from libavcodec/riscv/vvc/vvc_sad_rvv.S
rename to libavcodec/riscv/vvc/sad_rvv.S
diff --git a/libavcodec/x86/vvc/Makefile b/libavcodec/x86/vvc/Makefile
index aa59aa59cf..86a6c8ba7c 100644
--- a/libavcodec/x86/vvc/Makefile
+++ b/libavcodec/x86/vvc/Makefile
@@ -1,11 +1,11 @@
 clean::
 	$(RM) $(CLEANSUFFIXES:%=libavcodec/x86/vvc/%) $(CLEANSUFFIXES:%=libavcodec/x86/h26x/%)
 
-OBJS-$(CONFIG_VVC_DECODER)             += x86/vvc/vvcdsp_init.o \
+OBJS-$(CONFIG_VVC_DECODER)             += x86/vvc/dsp_init.o        \
                                           x86/h26x/h2656dsp.o
-X86ASM-OBJS-$(CONFIG_VVC_DECODER)      += x86/vvc/vvc_alf.o      \
-                                          x86/vvc/vvc_dmvr.o     \
-                                          x86/vvc/vvc_mc.o       \
-                                          x86/vvc/vvc_of.o       \
-                                          x86/vvc/vvc_sad.o      \
+X86ASM-OBJS-$(CONFIG_VVC_DECODER)      += x86/vvc/alf.o             \
+                                          x86/vvc/dmvr.o            \
+                                          x86/vvc/mc.o              \
+                                          x86/vvc/of.o              \
+                                          x86/vvc/sad.o             \
                                           x86/h26x/h2656_inter.o
diff --git a/libavcodec/x86/vvc/vvc_alf.asm b/libavcodec/x86/vvc/alf.asm
similarity index 100%
rename from libavcodec/x86/vvc/vvc_alf.asm
rename to libavcodec/x86/vvc/alf.asm
diff --git a/libavcodec/x86/vvc/vvc_dmvr.asm b/libavcodec/x86/vvc/dmvr.asm
similarity index 100%
rename from libavcodec/x86/vvc/vvc_dmvr.asm
rename to libavcodec/x86/vvc/dmvr.asm
diff --git a/libavcodec/x86/vvc/vvcdsp_init.c b/libavcodec/x86/vvc/dsp_init.c
similarity index 100%
rename from libavcodec/x86/vvc/vvcdsp_init.c
rename to libavcodec/x86/vvc/dsp_init.c
diff --git a/libavcodec/x86/vvc/vvc_mc.asm b/libavcodec/x86/vvc/mc.asm
similarity index 100%
rename from libavcodec/x86/vvc/vvc_mc.asm
rename to libavcodec/x86/vvc/mc.asm
diff --git a/libavcodec/x86/vvc/vvc_of.asm b/libavcodec/x86/vvc/of.asm
similarity index 100%
rename from libavcodec/x86/vvc/vvc_of.asm
rename to libavcodec/x86/vvc/of.asm
diff --git a/libavcodec/x86/vvc/vvc_sad.asm b/libavcodec/x86/vvc/sad.asm
similarity index 100%
rename from libavcodec/x86/vvc/vvc_sad.asm
rename to libavcodec/x86/vvc/sad.asm
-- 
2.34.1