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/me_cmp_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/me_cmp_init.c')
| -rw-r--r-- | libavcodec/x86/me_cmp_init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/x86/me_cmp_init.c b/libavcodec/x86/me_cmp_init.c index dc3e6f8668..6aec93e55f 100644 --- a/libavcodec/x86/me_cmp_init.c +++ b/libavcodec/x86/me_cmp_init.c @@ -89,7 +89,7 @@ hadamard_func(mmxext) hadamard_func(sse2) hadamard_func(ssse3) -#if HAVE_YASM +#if HAVE_X86ASM static int nsse16_mmx(MpegEncContext *c, uint8_t *pix1, uint8_t *pix2, ptrdiff_t stride, int h) { @@ -121,7 +121,7 @@ static int nsse8_mmx(MpegEncContext *c, uint8_t *pix1, uint8_t *pix2, return score1 + FFABS(score2) * 8; } -#endif /* HAVE_YASM */ +#endif /* HAVE_X86ASM */ #if HAVE_INLINE_ASM @@ -586,7 +586,7 @@ av_cold void ff_me_cmp_init_x86(MECmpContext *c, AVCodecContext *avctx) c->sum_abs_dctelem = ff_sum_abs_dctelem_mmx; c->sse[0] = ff_sse16_mmx; c->sse[1] = ff_sse8_mmx; -#if HAVE_YASM +#if HAVE_X86ASM c->nsse[0] = nsse16_mmx; c->nsse[1] = nsse8_mmx; #endif |