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/cavsdsp.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/cavsdsp.c')
| -rw-r--r-- | libavcodec/x86/cavsdsp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/x86/cavsdsp.c b/libavcodec/x86/cavsdsp.c index 0354333382..f190a6657e 100644 --- a/libavcodec/x86/cavsdsp.c +++ b/libavcodec/x86/cavsdsp.c @@ -542,17 +542,17 @@ static av_cold void cavsdsp_init_3dnow(CAVSDSPContext *c, av_cold void ff_cavsdsp_init_x86(CAVSDSPContext *c, AVCodecContext *avctx) { #if HAVE_MMX_INLINE - int mm_flags = av_get_cpu_flags(); + int cpu_flags = av_get_cpu_flags(); - if (mm_flags & AV_CPU_FLAG_MMX) + if (cpu_flags & AV_CPU_FLAG_MMX) cavsdsp_init_mmx(c, avctx); #endif /* HAVE_MMX_INLINE */ #if HAVE_MMXEXT_INLINE - if (mm_flags & AV_CPU_FLAG_MMXEXT) + if (cpu_flags & AV_CPU_FLAG_MMXEXT) cavsdsp_init_mmxext(c, avctx); #endif /* HAVE_MMXEXT_INLINE */ #if HAVE_AMD3DNOW_INLINE - if (mm_flags & AV_CPU_FLAG_3DNOW) + if (cpu_flags & AV_CPU_FLAG_3DNOW) cavsdsp_init_3dnow(c, avctx); #endif /* HAVE_AMD3DNOW_INLINE */ } |