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/fft_init.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/fft_init.c')
| -rw-r--r-- | libavcodec/x86/fft_init.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/libavcodec/x86/fft_init.c b/libavcodec/x86/fft_init.c index 77f5ba96f8..af6084f096 100644 --- a/libavcodec/x86/fft_init.c +++ b/libavcodec/x86/fft_init.c @@ -23,22 +23,23 @@ av_cold void ff_fft_init_x86(FFTContext *s) { - int has_vectors = av_get_cpu_flags(); + int cpu_flags = av_get_cpu_flags(); + #if ARCH_X86_32 - if (EXTERNAL_AMD3DNOW(has_vectors)) { + if (EXTERNAL_AMD3DNOW(cpu_flags)) { /* 3DNow! for K6-2/3 */ s->imdct_calc = ff_imdct_calc_3dnow; s->imdct_half = ff_imdct_half_3dnow; s->fft_calc = ff_fft_calc_3dnow; } - if (EXTERNAL_AMD3DNOWEXT(has_vectors)) { + if (EXTERNAL_AMD3DNOWEXT(cpu_flags)) { /* 3DNowEx for K7 */ s->imdct_calc = ff_imdct_calc_3dnowext; s->imdct_half = ff_imdct_half_3dnowext; s->fft_calc = ff_fft_calc_3dnowext; } #endif - if (EXTERNAL_SSE(has_vectors)) { + if (EXTERNAL_SSE(cpu_flags)) { /* SSE for P3/P4/K8 */ s->imdct_calc = ff_imdct_calc_sse; s->imdct_half = ff_imdct_half_sse; @@ -46,7 +47,7 @@ av_cold void ff_fft_init_x86(FFTContext *s) s->fft_calc = ff_fft_calc_sse; s->fft_permutation = FF_FFT_PERM_SWAP_LSBS; } - if (EXTERNAL_AVX(has_vectors) && s->nbits >= 5) { + if (EXTERNAL_AVX(cpu_flags) && s->nbits >= 5) { /* AVX for SB */ s->imdct_half = ff_imdct_half_avx; s->fft_calc = ff_fft_calc_avx; @@ -57,12 +58,13 @@ av_cold void ff_fft_init_x86(FFTContext *s) #if CONFIG_DCT av_cold void ff_dct_init_x86(DCTContext *s) { - int has_vectors = av_get_cpu_flags(); - if (EXTERNAL_SSE(has_vectors)) + int cpu_flags = av_get_cpu_flags(); + + if (EXTERNAL_SSE(cpu_flags)) s->dct32 = ff_dct32_float_sse; - if (EXTERNAL_SSE2(has_vectors)) + if (EXTERNAL_SSE2(cpu_flags)) s->dct32 = ff_dct32_float_sse2; - if (EXTERNAL_AVX(has_vectors)) + if (EXTERNAL_AVX(cpu_flags)) s->dct32 = ff_dct32_float_avx; } #endif |