summaryrefslogtreecommitdiff
path: root/libavcodec/x86/fmtconvert_init.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2016-10-08 14:18:33 +0000
committerJames Almer <jamrial@gmail.com>2017-06-21 17:00:29 -0300
commitfd502f4f5fe8d2f241102ca9a529aa7f88209c22 (patch)
tree145739652cff190593860ec2e371d3df148e7027 /libavcodec/x86/fmtconvert_init.c
parent664ac7c5e2e9b2b001be6124b90b398861c773af (diff)
build: Generalize yasm/nasm-related variable names
None of them are specific to the YASM assembler. (Cherry-picked from libav commit 39e208f4d4756367c7cd2d581847e0c1b8a429c1) Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/x86/fmtconvert_init.c')
-rw-r--r--libavcodec/x86/fmtconvert_init.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/x86/fmtconvert_init.c b/libavcodec/x86/fmtconvert_init.c
index 6d35377a77..df097054e4 100644
--- a/libavcodec/x86/fmtconvert_init.c
+++ b/libavcodec/x86/fmtconvert_init.c
@@ -27,7 +27,7 @@
#include "libavutil/x86/cpu.h"
#include "libavcodec/fmtconvert.h"
-#if HAVE_YASM
+#if HAVE_X86ASM
void ff_int32_to_float_fmul_scalar_sse (float *dst, const int32_t *src, float mul, int len);
void ff_int32_to_float_fmul_scalar_sse2(float *dst, const int32_t *src, float mul, int len);
@@ -36,11 +36,11 @@ void ff_int32_to_float_fmul_array8_sse (FmtConvertContext *c, float *dst, const
void ff_int32_to_float_fmul_array8_sse2(FmtConvertContext *c, float *dst, const int32_t *src,
const float *mul, int len);
-#endif /* HAVE_YASM */
+#endif /* HAVE_X86ASM */
av_cold void ff_fmt_convert_init_x86(FmtConvertContext *c, AVCodecContext *avctx)
{
-#if HAVE_YASM
+#if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags();
if (EXTERNAL_SSE(cpu_flags)) {
@@ -51,5 +51,5 @@ av_cold void ff_fmt_convert_init_x86(FmtConvertContext *c, AVCodecContext *avctx
c->int32_to_float_fmul_scalar = ff_int32_to_float_fmul_scalar_sse2;
c->int32_to_float_fmul_array8 = ff_int32_to_float_fmul_array8_sse2;
}
-#endif /* HAVE_YASM */
+#endif /* HAVE_X86ASM */
}