diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-18 09:53:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-18 09:53:47 +0200 |
| commit | 9d01bf7d66df74fe58d71b7e93e86895270a91c2 (patch) | |
| tree | 57ccb1be5c5c768f2213e6abab3fba03d32dfcb7 /libavcodec/x86/sbrdsp_init.c | |
| parent | 1816f5509e4f0fd55d32b5dbf70c3be21c1b1515 (diff) | |
| parent | 3ac7fa81b2383ff2697e5d1a76ff79be205f011a (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Consistently use "cpu_flags" as variable/parameter name for CPU flags
Conflicts:
libavcodec/x86/dsputil_init.c
libavcodec/x86/h264dsp_init.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/motion_est.c
libavcodec/x86/mpegvideo.c
libavcodec/x86/proresdsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/sbrdsp_init.c')
| -rw-r--r-- | libavcodec/x86/sbrdsp_init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/x86/sbrdsp_init.c b/libavcodec/x86/sbrdsp_init.c index 0bc4a6183e..0fbe534340 100644 --- a/libavcodec/x86/sbrdsp_init.c +++ b/libavcodec/x86/sbrdsp_init.c @@ -53,9 +53,9 @@ void ff_sbr_hf_apply_noise_3_sse2(float (*Y)[2], const float *s_m, av_cold void ff_sbrdsp_init_x86(SBRDSPContext *s) { - int mm_flags = av_get_cpu_flags(); + int cpu_flags = av_get_cpu_flags(); - if (EXTERNAL_SSE(mm_flags)) { + if (EXTERNAL_SSE(cpu_flags)) { s->neg_odd_64 = ff_sbr_neg_odd_64_sse; s->sum_square = ff_sbr_sum_square_sse; s->sum64x5 = ff_sbr_sum64x5_sse; @@ -65,7 +65,7 @@ av_cold void ff_sbrdsp_init_x86(SBRDSPContext *s) s->qmf_deint_bfly = ff_sbr_qmf_deint_bfly_sse; } - if (EXTERNAL_SSE2(mm_flags)) { + if (EXTERNAL_SSE2(cpu_flags)) { s->qmf_deint_bfly = ff_sbr_qmf_deint_bfly_sse2; s->qmf_pre_shuffle = ff_sbr_qmf_pre_shuffle_sse2; s->hf_apply_noise[0] = ff_sbr_hf_apply_noise_0_sse2; |