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/vp3dsp_init.c | |
| parent | 1816f5509e4f0fd55d32b5dbf70c3be21c1b1515 (diff) | |
| parent | 3ac7fa81b2383ff2697e5d1a76ff79be205f011a (diff) | |
| download | ffmpeg-9d01bf7d66df74fe58d71b7e93e86895270a91c2.tar.gz | |
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/vp3dsp_init.c')
| -rw-r--r-- | libavcodec/x86/vp3dsp_init.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/x86/vp3dsp_init.c b/libavcodec/x86/vp3dsp_init.c index 6a1986a59a..1f02a6f709 100644 --- a/libavcodec/x86/vp3dsp_init.c +++ b/libavcodec/x86/vp3dsp_init.c @@ -99,20 +99,20 @@ static void put_vp_no_rnd_pixels8_l2_mmx(uint8_t *dst, const uint8_t *a, const u av_cold void ff_vp3dsp_init_x86(VP3DSPContext *c, int flags) { - int cpuflags = av_get_cpu_flags(); + int cpu_flags = av_get_cpu_flags(); #if HAVE_MMX_INLINE c->put_no_rnd_pixels_l2 = put_vp_no_rnd_pixels8_l2_mmx; #endif /* HAVE_MMX_INLINE */ #if ARCH_X86_32 - if (EXTERNAL_MMX(cpuflags)) { + if (EXTERNAL_MMX(cpu_flags)) { c->idct_put = ff_vp3_idct_put_mmx; c->idct_add = ff_vp3_idct_add_mmx; } #endif - if (EXTERNAL_MMXEXT(cpuflags)) { + if (EXTERNAL_MMXEXT(cpu_flags)) { c->idct_dc_add = ff_vp3_idct_dc_add_mmxext; if (!(flags & CODEC_FLAG_BITEXACT)) { @@ -121,7 +121,7 @@ av_cold void ff_vp3dsp_init_x86(VP3DSPContext *c, int flags) } } - if (EXTERNAL_SSE2(cpuflags)) { + if (EXTERNAL_SSE2(cpu_flags)) { c->idct_put = ff_vp3_idct_put_sse2; c->idct_add = ff_vp3_idct_add_sse2; } |