RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86/tx_float: do not build tx_float_init.c if x86 assembly is disabled 

This broke builds with --disable-mmx, which also disabled assembly
entirely, but ARCH_X86 was still true, so the init file tried to find
assembly that didn't exist.
Instead of checking for architecture, check if external x86 assembly
is enabled.
This commit is contained in:
Lynne 2022-01-26 23:40:35 +01:00
parent b2421c4f26
commit 9787005846
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavutil/tx.c
View File

@ -439,7 +439,7 @@ av_cold int ff_tx_init_subtx(AVTXContext *s, enum AVTXType type,
ff_tx_codelet_list_double_c,
ff_tx_codelet_list_int32_c,
ff_tx_null_list,
#if ARCH_X86
#if HAVE_X86ASM
ff_tx_codelet_list_float_x86,
#endif
};

3
libavutil/x86/Makefile
View File

@ -3,7 +3,8 @@ OBJS += x86/cpu.o \
x86/float_dsp_init.o \
x86/imgutils_init.o \
x86/lls_init.o \
x86/tx_float_init.o \
OBJS-$(HAVE_X86ASM) += x86/tx_float_init.o \
OBJS-$(CONFIG_PIXELUTILS) += x86/pixelutils_init.o \