summaryrefslogtreecommitdiff
path: root/libavcodec/x86/mpegvideo.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-07-17 20:19:24 +0200
committerDiego Biurrun <diego@biurrun.de>2013-07-18 00:31:35 +0200
commit3ac7fa81b2383ff2697e5d1a76ff79be205f011a (patch)
treed080e675151c826cad78a3a645a64bfd95732dbb /libavcodec/x86/mpegvideo.c
parentb6293e2798afab60596a87010b6163fcb4ca3086 (diff)
Consistently use "cpu_flags" as variable/parameter name for CPU flags
Diffstat (limited to 'libavcodec/x86/mpegvideo.c')
-rw-r--r--libavcodec/x86/mpegvideo.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/x86/mpegvideo.c b/libavcodec/x86/mpegvideo.c
index 68f3b62fdd..2289a6dcc1 100644
--- a/libavcodec/x86/mpegvideo.c
+++ b/libavcodec/x86/mpegvideo.c
@@ -557,9 +557,9 @@ static void denoise_dct_sse2(MpegEncContext *s, int16_t *block){
av_cold void ff_MPV_common_init_x86(MpegEncContext *s)
{
#if HAVE_INLINE_ASM
- 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) {
s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_mmx;
s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_mmx;
s->dct_unquantize_mpeg1_intra = dct_unquantize_mpeg1_intra_mmx;
@@ -568,7 +568,7 @@ av_cold void ff_MPV_common_init_x86(MpegEncContext *s)
s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_mmx;
s->dct_unquantize_mpeg2_inter = dct_unquantize_mpeg2_inter_mmx;
- if (mm_flags & AV_CPU_FLAG_SSE2) {
+ if (cpu_flags & AV_CPU_FLAG_SSE2) {
s->denoise_dct= denoise_dct_sse2;
} else {
s->denoise_dct= denoise_dct_mmx;