diff options
| author | Diego Biurrun <diego@biurrun.de> | 2016-10-08 16:18:33 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2017-03-01 10:18:15 +0100 |
| commit | 39e208f4d4756367c7cd2d581847e0c1b8a429c1 (patch) | |
| tree | 6c3b1695b47827dc2224fdf75b0c0be781579847 /libavfilter | |
| parent | d1d6230ea3dd2c34bcd121f958706f3177f8d8c5 (diff) | |
build: Generalize yasm/nasm-related variable names
None of them are specific to the YASM assembler.
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/x86/Makefile | 10 | ||||
| -rw-r--r-- | libavfilter/x86/vf_gradfun_init.c | 8 | ||||
| -rw-r--r-- | libavfilter/x86/vf_hqdn3d_init.c | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/libavfilter/x86/Makefile b/libavfilter/x86/Makefile index 13b5d318ec..6b27ddc40b 100644 --- a/libavfilter/x86/Makefile +++ b/libavfilter/x86/Makefile @@ -4,8 +4,8 @@ OBJS-$(CONFIG_INTERLACE_FILTER) += x86/vf_interlace_init.o OBJS-$(CONFIG_VOLUME_FILTER) += x86/af_volume_init.o OBJS-$(CONFIG_YADIF_FILTER) += x86/vf_yadif_init.o -YASM-OBJS-$(CONFIG_GRADFUN_FILTER) += x86/vf_gradfun.o -YASM-OBJS-$(CONFIG_HQDN3D_FILTER) += x86/vf_hqdn3d.o -YASM-OBJS-$(CONFIG_INTERLACE_FILTER) += x86/vf_interlace.o -YASM-OBJS-$(CONFIG_VOLUME_FILTER) += x86/af_volume.o -YASM-OBJS-$(CONFIG_YADIF_FILTER) += x86/vf_yadif.o +X86ASM-OBJS-$(CONFIG_GRADFUN_FILTER) += x86/vf_gradfun.o +X86ASM-OBJS-$(CONFIG_HQDN3D_FILTER) += x86/vf_hqdn3d.o +X86ASM-OBJS-$(CONFIG_INTERLACE_FILTER) += x86/vf_interlace.o +X86ASM-OBJS-$(CONFIG_VOLUME_FILTER) += x86/af_volume.o +X86ASM-OBJS-$(CONFIG_YADIF_FILTER) += x86/vf_yadif.o diff --git a/libavfilter/x86/vf_gradfun_init.c b/libavfilter/x86/vf_gradfun_init.c index f8d85c7120..0f074d7310 100644 --- a/libavfilter/x86/vf_gradfun_init.c +++ b/libavfilter/x86/vf_gradfun_init.c @@ -40,7 +40,7 @@ void ff_gradfun_blur_line_movdqu_sse2(intptr_t x, uint16_t *buf, uint16_t *buf1, uint16_t *dc, uint8_t *src1, uint8_t *src2); -#if HAVE_YASM +#if HAVE_X86ASM static void gradfun_filter_line(uint8_t *dst, uint8_t *src, uint16_t *dc, int width, int thresh, const uint16_t *dithers, int alignment) @@ -84,11 +84,11 @@ static void gradfun_blur_line_sse2(uint16_t *dc, uint16_t *buf, uint16_t *buf1, dc + width, src + width * 2, src + width * 2 + src_linesize); } -#endif /* HAVE_YASM */ +#endif /* HAVE_X86ASM */ av_cold void ff_gradfun_init_x86(GradFunContext *gf) { -#if HAVE_YASM +#if HAVE_X86ASM int cpu_flags = av_get_cpu_flags(); if (EXTERNAL_MMXEXT(cpu_flags)) @@ -98,5 +98,5 @@ av_cold void ff_gradfun_init_x86(GradFunContext *gf) if (EXTERNAL_SSE2(cpu_flags)) gf->blur_line = gradfun_blur_line_sse2; -#endif /* HAVE_YASM */ +#endif /* HAVE_X86ASM */ } diff --git a/libavfilter/x86/vf_hqdn3d_init.c b/libavfilter/x86/vf_hqdn3d_init.c index 06f9e00ec9..5a01a58b97 100644 --- a/libavfilter/x86/vf_hqdn3d_init.c +++ b/libavfilter/x86/vf_hqdn3d_init.c @@ -38,10 +38,10 @@ void ff_hqdn3d_row_16_x86(uint8_t *src, uint8_t *dst, uint16_t *line_ant, av_cold void ff_hqdn3d_init_x86(HQDN3DContext *hqdn3d) { -#if HAVE_YASM +#if HAVE_X86ASM hqdn3d->denoise_row[8] = ff_hqdn3d_row_8_x86; hqdn3d->denoise_row[9] = ff_hqdn3d_row_9_x86; hqdn3d->denoise_row[10] = ff_hqdn3d_row_10_x86; hqdn3d->denoise_row[16] = ff_hqdn3d_row_16_x86; -#endif /* HAVE_YASM */ +#endif /* HAVE_X86ASM */ } |