diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-30 12:49:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-30 12:50:01 +0200 |
| commit | 62a6052974d89e5463f21930d46c69fab3f0d804 (patch) | |
| tree | 864406a6240c60572f70c3bff4e941cb013f5729 /libavcodec/x86/rv40dsp_init.c | |
| parent | 7fb758cd8ed08e4a37f10e25003953d13c68b8cd (diff) | |
| parent | e998b56362c711701b3daa34e7b956e7126336f4 (diff) | |
| download | ffmpeg-62a6052974d89e5463f21930d46c69fab3f0d804.tar.gz | |
Merge commit 'e998b56362c711701b3daa34e7b956e7126336f4'
* commit 'e998b56362c711701b3daa34e7b956e7126336f4':
x86: avcodec: Consistently structure CPU extension initialization
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/rv40dsp_init.c')
| -rw-r--r-- | libavcodec/x86/rv40dsp_init.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libavcodec/x86/rv40dsp_init.c b/libavcodec/x86/rv40dsp_init.c index 7eb209804a..75ba8ba12c 100644 --- a/libavcodec/x86/rv40dsp_init.c +++ b/libavcodec/x86/rv40dsp_init.c @@ -232,6 +232,13 @@ av_cold void ff_rv40dsp_init_x86(RV34DSPContext *c) QPEL_MC_SET(put_, _mmx) #endif } + if (EXTERNAL_AMD3DNOW(cpu_flags)) { + c->avg_chroma_pixels_tab[0] = ff_avg_rv40_chroma_mc8_3dnow; + c->avg_chroma_pixels_tab[1] = ff_avg_rv40_chroma_mc4_3dnow; +#if ARCH_X86_32 + QPEL_MC_SET(avg_, _3dnow) +#endif + } if (EXTERNAL_MMXEXT(cpu_flags)) { c->avg_chroma_pixels_tab[0] = ff_avg_rv40_chroma_mc8_mmxext; c->avg_chroma_pixels_tab[1] = ff_avg_rv40_chroma_mc4_mmxext; @@ -242,12 +249,6 @@ av_cold void ff_rv40dsp_init_x86(RV34DSPContext *c) #if ARCH_X86_32 QPEL_MC_SET(avg_, _mmxext) #endif - } else if (EXTERNAL_AMD3DNOW(cpu_flags)) { - c->avg_chroma_pixels_tab[0] = ff_avg_rv40_chroma_mc8_3dnow; - c->avg_chroma_pixels_tab[1] = ff_avg_rv40_chroma_mc4_3dnow; -#if ARCH_X86_32 - QPEL_MC_SET(avg_, _3dnow) -#endif } if (EXTERNAL_SSE2(cpu_flags)) { c->rv40_weight_pixels_tab[0][0] = ff_rv40_weight_func_rnd_16_sse2; |