diff options
| author | Michael Niedermayer <[email protected]> | 2013-07-18 09:53:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-07-18 09:53:47 +0200 |
| commit | 9d01bf7d66df74fe58d71b7e93e86895270a91c2 (patch) | |
| tree | 57ccb1be5c5c768f2213e6abab3fba03d32dfcb7 /libavcodec/x86/vp56dsp_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 <[email protected]>
Diffstat (limited to 'libavcodec/x86/vp56dsp_init.c')
| -rw-r--r-- | libavcodec/x86/vp56dsp_init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/x86/vp56dsp_init.c b/libavcodec/x86/vp56dsp_init.c index defc63b0ea..09bdb1030d 100644 --- a/libavcodec/x86/vp56dsp_init.c +++ b/libavcodec/x86/vp56dsp_init.c @@ -32,16 +32,16 @@ void ff_vp6_filter_diag4_sse2(uint8_t *dst, uint8_t *src, int stride, av_cold void ff_vp56dsp_init_x86(VP56DSPContext* c, enum AVCodecID codec) { - int mm_flags = av_get_cpu_flags(); + int cpu_flags = av_get_cpu_flags(); if (CONFIG_VP6_DECODER && codec == AV_CODEC_ID_VP6) { #if ARCH_X86_32 - if (EXTERNAL_MMX(mm_flags)) { + if (EXTERNAL_MMX(cpu_flags)) { c->vp6_filter_diag4 = ff_vp6_filter_diag4_mmx; } #endif - if (EXTERNAL_SSE2(mm_flags)) { + if (EXTERNAL_SSE2(cpu_flags)) { c->vp6_filter_diag4 = ff_vp6_filter_diag4_sse2; } } |