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/vc1dsp_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/vc1dsp_init.c')
| -rw-r--r-- | libavcodec/x86/vc1dsp_init.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/x86/vc1dsp_init.c b/libavcodec/x86/vc1dsp_init.c index c477d8485c..9f18131a24 100644 --- a/libavcodec/x86/vc1dsp_init.c +++ b/libavcodec/x86/vc1dsp_init.c @@ -103,13 +103,14 @@ av_cold void ff_vc1dsp_init_x86(VC1DSPContext *dsp) if (EXTERNAL_MMX(cpu_flags)) { dsp->put_no_rnd_vc1_chroma_pixels_tab[0] = ff_put_vc1_chroma_mc8_nornd_mmx; } + if (EXTERNAL_AMD3DNOW(cpu_flags)) { + dsp->avg_no_rnd_vc1_chroma_pixels_tab[0] = ff_avg_vc1_chroma_mc8_nornd_3dnow; + } if (EXTERNAL_MMXEXT(cpu_flags)) { ASSIGN_LF(mmxext); dsp->avg_no_rnd_vc1_chroma_pixels_tab[0] = ff_avg_vc1_chroma_mc8_nornd_mmxext; dsp->avg_vc1_mspel_pixels_tab[0] = avg_vc1_mspel_mc00_mmxext; - } else if (EXTERNAL_AMD3DNOW(cpu_flags)) { - dsp->avg_no_rnd_vc1_chroma_pixels_tab[0] = ff_avg_vc1_chroma_mc8_nornd_3dnow; } if (EXTERNAL_SSE2(cpu_flags)) { dsp->vc1_v_loop_filter8 = ff_vc1_v_loop_filter8_sse2; |