summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2024-03-08 10:05:32 +0200
committerMartin Storsjö <martin@martin.st>2024-03-10 23:46:48 +0200
commitc31d2326560087b80f8523b27060ad6388369cac (patch)
tree9e05725fae1b9a73445796540d75848d556f8e8b /libavcodec
parentcd420c2949413bcd93cd47c683dfe2349aea25ae (diff)
libavcodec: Don't include libavcodec/x86/vvc/Makefile on any architecture
This currently builds files in the libavcodec/x86/{vvc,h26x} subdirectories, which is somewhat unexpected when building for another architecture than x86. The regular arch subdirectories are handled with -include $(SRC_PATH)/$(1)/$(ARCH)/Makefile in the toplevel Makefile. Switch this to a similar optional inclusion, using $(ARCH). Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 5d99120aa9..708434ac76 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -64,7 +64,7 @@ OBJS = ac3_parser.o \
# subsystems
include $(SRC_PATH)/libavcodec/vvc/Makefile
-include $(SRC_PATH)/libavcodec/x86/vvc/Makefile
+-include $(SRC_PATH)/libavcodec/$(ARCH)/vvc/Makefile
OBJS-$(CONFIG_AANDCTTABLES) += aandcttab.o
OBJS-$(CONFIG_AC3DSP) += ac3dsp.o ac3.o ac3tab.o
OBJS-$(CONFIG_ADTS_HEADER) += adts_header.o mpeg4audio_sample_rates.o