diff options
| author | Diego Biurrun <diego@biurrun.de> | 2016-10-08 14:18:33 +0000 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-06-21 17:00:29 -0300 |
| commit | fd502f4f5fe8d2f241102ca9a529aa7f88209c22 (patch) | |
| tree | 145739652cff190593860ec2e371d3df148e7027 /libavcodec/x86/videodsp_init.c | |
| parent | 664ac7c5e2e9b2b001be6124b90b398861c773af (diff) | |
| download | ffmpeg-fd502f4f5fe8d2f241102ca9a529aa7f88209c22.tar.gz | |
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/videodsp_init.c')
| -rw-r--r-- | libavcodec/x86/videodsp_init.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/x86/videodsp_init.c b/libavcodec/x86/videodsp_init.c index 26e072bb12..eeebb41547 100644 --- a/libavcodec/x86/videodsp_init.c +++ b/libavcodec/x86/videodsp_init.c @@ -29,7 +29,7 @@ #include "libavutil/x86/cpu.h" #include "libavcodec/videodsp.h" -#if HAVE_YASM +#if HAVE_X86ASM typedef void emu_edge_vfix_func(uint8_t *dst, x86_reg dst_stride, const uint8_t *src, x86_reg src_stride, x86_reg start_y, x86_reg end_y, x86_reg bh); @@ -271,14 +271,14 @@ static av_noinline void emulated_edge_mc_avx2(uint8_t *buf, const uint8_t *src, hfixtbl_avx2, &ff_emu_edge_hvar_avx2); } #endif /* HAVE_AVX2_EXTERNAL */ -#endif /* HAVE_YASM */ +#endif /* HAVE_X86ASM */ void ff_prefetch_mmxext(uint8_t *buf, ptrdiff_t stride, int h); void ff_prefetch_3dnow(uint8_t *buf, ptrdiff_t stride, int h); av_cold void ff_videodsp_init_x86(VideoDSPContext *ctx, int bpc) { -#if HAVE_YASM +#if HAVE_X86ASM int cpu_flags = av_get_cpu_flags(); #if ARCH_X86_32 @@ -305,5 +305,5 @@ av_cold void ff_videodsp_init_x86(VideoDSPContext *ctx, int bpc) ctx->emulated_edge_mc = emulated_edge_mc_avx2; } #endif -#endif /* HAVE_YASM */ +#endif /* HAVE_X86ASM */ } |