diff options
| author | Lynne <dev@lynne.ee> | 2022-02-02 07:50:59 +0100 |
|---|---|---|
| committer | Lynne <dev@lynne.ee> | 2022-02-02 07:51:45 +0100 |
| commit | 2e82c610553efd69b4d9b6c359423a19c2868255 (patch) | |
| tree | 01d09289692f843f7ad37e51534e3730b98e571d /libavutil | |
| parent | b5a8b3d45a292746a08317752ac01d216077e948 (diff) | |
| download | ffmpeg-2e82c610553efd69b4d9b6c359423a19c2868255.tar.gz | |
x86/tx_float: avoid redefining macros
FFT16_FN was used for fft8 and for fft16 afterwards.
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/x86/tx_float.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavutil/x86/tx_float.asm b/libavutil/x86/tx_float.asm index 8698e858d0..d9d431f577 100644 --- a/libavutil/x86/tx_float.asm +++ b/libavutil/x86/tx_float.asm @@ -707,7 +707,7 @@ cglobal fft4_ %+ %1 %+ _float, 4, 4, 3, ctx, out, in, stride FFT4 fwd, 0 FFT4 inv, 1 -%macro FFT8_FN 2 +%macro FFT8_SSE_FN 2 INIT_XMM sse3 cglobal fft8_ %+ %1, 4, 4, 6, ctx, out, in, tmp %if %2 @@ -738,10 +738,10 @@ cglobal fft8_ %+ %1, 4, 4, 6, ctx, out, in, tmp RET %endmacro -FFT8_FN float, 1 -FFT8_FN ns_float, 0 +FFT8_SSE_FN float, 1 +FFT8_SSE_FN ns_float, 0 -%macro FFT16_FN 2 +%macro FFT8_AVX_FN 2 INIT_YMM avx cglobal fft8_ %+ %1, 4, 4, 4, ctx, out, in, tmp %if %2 @@ -767,8 +767,8 @@ cglobal fft8_ %+ %1, 4, 4, 4, ctx, out, in, tmp RET %endmacro -FFT16_FN float, 1 -FFT16_FN ns_float, 0 +FFT8_AVX_FN float, 1 +FFT8_AVX_FN ns_float, 0 %macro FFT16_FN 3 INIT_YMM %1 |