diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-07-17 20:19:24 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-07-18 00:31:35 +0200 |
| commit | 3ac7fa81b2383ff2697e5d1a76ff79be205f011a (patch) | |
| tree | d080e675151c826cad78a3a645a64bfd95732dbb /libavcodec/x86/motion_est.c | |
| parent | b6293e2798afab60596a87010b6163fcb4ca3086 (diff) | |
| download | ffmpeg-3ac7fa81b2383ff2697e5d1a76ff79be205f011a.tar.gz | |
Consistently use "cpu_flags" as variable/parameter name for CPU flags
Diffstat (limited to 'libavcodec/x86/motion_est.c')
| -rw-r--r-- | libavcodec/x86/motion_est.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/x86/motion_est.c b/libavcodec/x86/motion_est.c index 8ef72112dc..361c16f02a 100644 --- a/libavcodec/x86/motion_est.c +++ b/libavcodec/x86/motion_est.c @@ -435,9 +435,9 @@ PIX_SAD(mmxext) av_cold void ff_dsputil_init_pix_mmx(DSPContext *c, AVCodecContext *avctx) { #if HAVE_INLINE_ASM - int mm_flags = av_get_cpu_flags(); + int cpu_flags = av_get_cpu_flags(); - if (mm_flags & AV_CPU_FLAG_MMX) { + if (cpu_flags & AV_CPU_FLAG_MMX) { c->pix_abs[0][0] = sad16_mmx; c->pix_abs[0][1] = sad16_x2_mmx; c->pix_abs[0][2] = sad16_y2_mmx; @@ -450,7 +450,7 @@ av_cold void ff_dsputil_init_pix_mmx(DSPContext *c, AVCodecContext *avctx) c->sad[0]= sad16_mmx; c->sad[1]= sad8_mmx; } - if (mm_flags & AV_CPU_FLAG_MMXEXT) { + if (cpu_flags & AV_CPU_FLAG_MMXEXT) { c->pix_abs[0][0] = sad16_mmxext; c->pix_abs[1][0] = sad8_mmxext; @@ -466,7 +466,7 @@ av_cold void ff_dsputil_init_pix_mmx(DSPContext *c, AVCodecContext *avctx) c->pix_abs[1][3] = sad8_xy2_mmxext; } } - if ((mm_flags & AV_CPU_FLAG_SSE2) && !(mm_flags & AV_CPU_FLAG_3DNOW)) { + if ((cpu_flags & AV_CPU_FLAG_SSE2) && !(cpu_flags & AV_CPU_FLAG_3DNOW)) { c->sad[0]= sad16_sse2; } #endif /* HAVE_INLINE_ASM */ |