diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-27 16:49:57 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-27 17:24:28 +0400 |
| commit | 91c8921d807be9a3c542967a7cb99758a16b41fe (patch) | |
| tree | 2902904fce5876de769c895f768fd4b17b727fa4 /libavcodec/x86/vc1dsp_mmx.c | |
| parent | 6b2f7fd1c7285974898c31d48d477728a30199f9 (diff) | |
| parent | 71155d7b4157fee44c0d3d0fc1b660ebfb9ccf46 (diff) | |
Merge commit '71155d7b4157fee44c0d3d0fc1b660ebfb9ccf46'
* commit '71155d7b4157fee44c0d3d0fc1b660ebfb9ccf46':
dsputil: x86: Convert mpeg4 qpel and dsputil avg to yasm
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/vc1dsp_mmx.c')
| -rw-r--r-- | libavcodec/x86/vc1dsp_mmx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/x86/vc1dsp_mmx.c b/libavcodec/x86/vc1dsp_mmx.c index a7695357d9..863726eeb7 100644 --- a/libavcodec/x86/vc1dsp_mmx.c +++ b/libavcodec/x86/vc1dsp_mmx.c @@ -696,7 +696,9 @@ static void vc1_inv_trans_8x8_dc_mmxext(uint8_t *dest, int linesize, av_cold void ff_vc1dsp_init_mmx(VC1DSPContext *dsp) { +#if HAVE_YASM dsp->put_vc1_mspel_pixels_tab[ 0] = ff_put_vc1_mspel_mc00_mmx; +#endif /* HAVE_YASM */ dsp->put_vc1_mspel_pixels_tab[ 4] = put_vc1_mspel_mc01_mmx; dsp->put_vc1_mspel_pixels_tab[ 8] = put_vc1_mspel_mc02_mmx; dsp->put_vc1_mspel_pixels_tab[12] = put_vc1_mspel_mc03_mmx; @@ -719,7 +721,9 @@ av_cold void ff_vc1dsp_init_mmx(VC1DSPContext *dsp) av_cold void ff_vc1dsp_init_mmxext(VC1DSPContext *dsp) { +#if HAVE_YASM dsp->avg_vc1_mspel_pixels_tab[ 0] = ff_avg_vc1_mspel_mc00_mmxext; +#endif /* HAVE_YASM */ dsp->avg_vc1_mspel_pixels_tab[ 4] = avg_vc1_mspel_mc01_mmxext; dsp->avg_vc1_mspel_pixels_tab[ 8] = avg_vc1_mspel_mc02_mmxext; dsp->avg_vc1_mspel_pixels_tab[12] = avg_vc1_mspel_mc03_mmxext; |