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/mpegaudiodsp.c | |
| parent | b6293e2798afab60596a87010b6163fcb4ca3086 (diff) | |
Consistently use "cpu_flags" as variable/parameter name for CPU flags
Diffstat (limited to 'libavcodec/x86/mpegaudiodsp.c')
| -rw-r--r-- | libavcodec/x86/mpegaudiodsp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/x86/mpegaudiodsp.c b/libavcodec/x86/mpegaudiodsp.c index 79a29ce506..b6c30b0378 100644 --- a/libavcodec/x86/mpegaudiodsp.c +++ b/libavcodec/x86/mpegaudiodsp.c @@ -226,7 +226,7 @@ DECL_IMDCT_BLOCKS(avx,avx) av_cold void ff_mpadsp_init_x86(MPADSPContext *s) { - int mm_flags = av_get_cpu_flags(); + int cpu_flags = av_get_cpu_flags(); int i, j; for (j = 0; j < 4; j++) { @@ -243,21 +243,21 @@ av_cold void ff_mpadsp_init_x86(MPADSPContext *s) } #if HAVE_SSE2_INLINE - if (mm_flags & AV_CPU_FLAG_SSE2) { + if (cpu_flags & AV_CPU_FLAG_SSE2) { s->apply_window_float = apply_window_mp3; } #endif /* HAVE_SSE2_INLINE */ #if HAVE_YASM - if (EXTERNAL_AVX(mm_flags)) { + if (EXTERNAL_AVX(cpu_flags)) { s->imdct36_blocks_float = imdct36_blocks_avx; - } else if (EXTERNAL_SSSE3(mm_flags)) { + } else if (EXTERNAL_SSSE3(cpu_flags)) { s->imdct36_blocks_float = imdct36_blocks_ssse3; - } else if (EXTERNAL_SSE3(mm_flags)) { + } else if (EXTERNAL_SSE3(cpu_flags)) { s->imdct36_blocks_float = imdct36_blocks_sse3; - } else if (EXTERNAL_SSE2(mm_flags)) { + } else if (EXTERNAL_SSE2(cpu_flags)) { s->imdct36_blocks_float = imdct36_blocks_sse2; - } else if (EXTERNAL_SSE(mm_flags)) { + } else if (EXTERNAL_SSE(cpu_flags)) { s->imdct36_blocks_float = imdct36_blocks_sse; } #endif /* HAVE_YASM */ |