From 6b6eb7d74eb4a0d662cd450688db74619c15fb28 Mon Sep 17 00:00:00 2001 From: James Almer Date: Thu, 1 Feb 2024 15:57:37 -0300 Subject: [PATCH] x86/Makefile: fix hevc and vvc dependency of h2656dsp.o And remove tabs while at it. Signed-off-by: James Almer --- libavcodec/x86/Makefile | 2 +- libavcodec/x86/vvc/Makefile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 8098cd840c..21c5e9b0d4 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -54,7 +54,7 @@ OBJS-$(CONFIG_FLAC_DECODER) += x86/flacdsp_init.o OBJS-$(CONFIG_FLAC_ENCODER) += x86/flacencdsp_init.o OBJS-$(CONFIG_OPUS_DECODER) += x86/opusdsp_init.o OBJS-$(CONFIG_OPUS_ENCODER) += x86/celt_pvq_init.o -OBJS-$(CONFIG_HEVC_DECODER) += x86/hevcdsp_init.o +OBJS-$(CONFIG_HEVC_DECODER) += x86/hevcdsp_init.o x86/h26x/h2656dsp.o OBJS-$(CONFIG_JPEG2000_DECODER) += x86/jpeg2000dsp_init.o OBJS-$(CONFIG_LSCR_DECODER) += x86/pngdsp_init.o OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp_init.o diff --git a/libavcodec/x86/vvc/Makefile b/libavcodec/x86/vvc/Makefile index 29765a6c48..82f281d1c7 100644 --- a/libavcodec/x86/vvc/Makefile +++ b/libavcodec/x86/vvc/Makefile @@ -1,7 +1,7 @@ clean:: $(RM) $(CLEANSUFFIXES:%=libavcodec/x86/vvc/%) -OBJS-$(CONFIG_VVC_DECODER) += x86/vvc/vvcdsp_init.o +OBJS-$(CONFIG_VVC_DECODER) += x86/vvc/vvcdsp_init.o \ + x86/h26x/h2656dsp.o X86ASM-OBJS-$(CONFIG_VVC_DECODER) += x86/vvc/vvc_mc.o \ - x86/h26x/h2656dsp.o \ - x86/h26x/h2656_inter.o + x86/h26x/h2656_inter.o