diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2014-04-22 11:19:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-22 14:01:53 +0200 |
| commit | 5809c2a99d9682f64f77b0ad23fa907aa9e8fce2 (patch) | |
| tree | d908f64ebaca18580f9f4fb34e089b3751772902 | |
| parent | 8064c6ac5fe97b77f833d988be9a9b3192b2f4a8 (diff) | |
| download | ffmpeg-5809c2a99d9682f64f77b0ad23fa907aa9e8fce2.tar.gz | |
vc1dsp: fix build without inline asm
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/x86/vc1dsp_init.c | 14 | ||||
| -rw-r--r-- | libavcodec/x86/vc1dsp_mmx.c | 12 |
2 files changed, 12 insertions, 14 deletions
diff --git a/libavcodec/x86/vc1dsp_init.c b/libavcodec/x86/vc1dsp_init.c index d81c28451e..2bef5f5fb5 100644 --- a/libavcodec/x86/vc1dsp_init.c +++ b/libavcodec/x86/vc1dsp_init.c @@ -63,23 +63,11 @@ static void vc1_h_loop_filter16_sse4(uint8_t *src, int stride, int pq) ff_vc1_h_loop_filter8_sse4(src, stride, pq); ff_vc1_h_loop_filter8_sse4(src+8*stride, stride, pq); } - -static void avg_vc1_mspel_mc00_mmx(uint8_t *dst, const uint8_t *src, - ptrdiff_t stride, int rnd) -{ - ff_avg_pixels8_mmx(dst, src, stride, 8); -} static void avg_vc1_mspel_mc00_mmxext(uint8_t *dst, const uint8_t *src, ptrdiff_t stride, int rnd) { ff_avg_pixels8_mmxext(dst, src, stride, 8); } - -static void avg_vc1_mspel_mc00_16_mmx(uint8_t *dst, const uint8_t *src, - ptrdiff_t stride, int rnd) -{ - ff_avg_pixels16_mmx(dst, src, stride, 16); -} static void avg_vc1_mspel_mc00_16_sse2(uint8_t *dst, const uint8_t *src, ptrdiff_t stride, int rnd) { @@ -121,8 +109,6 @@ av_cold void ff_vc1dsp_init_x86(VC1DSPContext *dsp) #if HAVE_YASM if (EXTERNAL_MMX(cpu_flags)) { dsp->put_no_rnd_vc1_chroma_pixels_tab[0] = ff_put_vc1_chroma_mc8_nornd_mmx; - dsp->avg_vc1_mspel_pixels_tab[0][0] = avg_vc1_mspel_mc00_16_mmx; - dsp->avg_vc1_mspel_pixels_tab[1][0] = avg_vc1_mspel_mc00_mmx; } if (EXTERNAL_AMD3DNOW(cpu_flags)) { dsp->avg_no_rnd_vc1_chroma_pixels_tab[0] = ff_avg_vc1_chroma_mc8_nornd_3dnow; diff --git a/libavcodec/x86/vc1dsp_mmx.c b/libavcodec/x86/vc1dsp_mmx.c index d9108fc832..87e4638ca7 100644 --- a/libavcodec/x86/vc1dsp_mmx.c +++ b/libavcodec/x86/vc1dsp_mmx.c @@ -738,6 +738,16 @@ static void put_vc1_mspel_mc00_16_mmx(uint8_t *dst, const uint8_t *src, { ff_put_pixels16_mmx(dst, src, stride, 16); } +static void avg_vc1_mspel_mc00_mmx(uint8_t *dst, const uint8_t *src, + ptrdiff_t stride, int rnd) +{ + ff_avg_pixels8_mmx(dst, src, stride, 8); +} +static void avg_vc1_mspel_mc00_16_mmx(uint8_t *dst, const uint8_t *src, + ptrdiff_t stride, int rnd) +{ + ff_avg_pixels16_mmx(dst, src, stride, 16); +} #define FN_ASSIGN(OP, X, Y, INSN) \ dsp->OP##vc1_mspel_pixels_tab[1][X+4*Y] = OP##vc1_mspel_mc##X##Y##INSN; \ @@ -764,6 +774,8 @@ av_cold void ff_vc1dsp_init_mmx(VC1DSPContext *dsp) FN_ASSIGN(put_, 3, 1, _mmx); FN_ASSIGN(put_, 3, 2, _mmx); FN_ASSIGN(put_, 3, 3, _mmx); + + FN_ASSIGN(avg_, 0, 0, _mmx); } av_cold void ff_vc1dsp_init_mmxext(VC1DSPContext *dsp) |