aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/x86/pngdsp_init.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-18 09:53:47 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-18 09:53:47 +0200
commit9d01bf7d66df74fe58d71b7e93e86895270a91c2 (patch)
tree57ccb1be5c5c768f2213e6abab3fba03d32dfcb7 /libavcodec/x86/pngdsp_init.c
parent1816f5509e4f0fd55d32b5dbf70c3be21c1b1515 (diff)
parent3ac7fa81b2383ff2697e5d1a76ff79be205f011a (diff)
downloadffmpeg-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/pngdsp_init.c')
-rw-r--r--libavcodec/x86/pngdsp_init.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/x86/pngdsp_init.c b/libavcodec/x86/pngdsp_init.c
index 4c54ed30cf..7dca62c675 100644
--- a/libavcodec/x86/pngdsp_init.c
+++ b/libavcodec/x86/pngdsp_init.c
@@ -35,16 +35,16 @@ void ff_add_bytes_l2_sse2(uint8_t *dst, uint8_t *src1,
av_cold void ff_pngdsp_init_x86(PNGDSPContext *dsp)
{
- int flags = av_get_cpu_flags();
+ int cpu_flags = av_get_cpu_flags();
#if ARCH_X86_32
- if (EXTERNAL_MMX(flags))
+ if (EXTERNAL_MMX(cpu_flags))
dsp->add_bytes_l2 = ff_add_bytes_l2_mmx;
#endif
- if (EXTERNAL_MMXEXT(flags))
+ if (EXTERNAL_MMXEXT(cpu_flags))
dsp->add_paeth_prediction = ff_add_png_paeth_prediction_mmxext;
- if (EXTERNAL_SSE2(flags))
+ if (EXTERNAL_SSE2(cpu_flags))
dsp->add_bytes_l2 = ff_add_bytes_l2_sse2;
- if (EXTERNAL_SSSE3(flags))
+ if (EXTERNAL_SSSE3(cpu_flags))
dsp->add_paeth_prediction = ff_add_png_paeth_prediction_ssse3;
}