From 2ad2768adcfeb2555100be6263483b4794ba8a3e Mon Sep 17 00:00:00 2001 From: David McPaul Date: Sat, 11 Apr 2009 22:53:43 +0000 Subject: [PATCH] ifdef out another function that causes issues under linux git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30128 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../media/plugins/avcodec/libavcodec/x86/dsputil_mmx.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx.c b/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx.c index 2f47f5fde9..2e6563c1d3 100644 --- a/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx.c +++ b/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx.c @@ -1639,6 +1639,7 @@ QPEL_2TAP(avg_, 8, 3dnow) static void just_return(void) { return; } #endif +#ifndef __HAIKU__ static void gmc_mmx(uint8_t *dst, uint8_t *src, int stride, int h, int ox, int oy, int dxx, int dxy, int dyx, int dyy, int shift, int r, int width, int height){ const int w = 8; @@ -1757,6 +1758,12 @@ static void gmc_mmx(uint8_t *dst, uint8_t *src, int stride, int h, int ox, int o } } +#else +static void gmc_mmx(uint8_t *dst, uint8_t *src, int stride, int h, int ox, int oy, + int dxx, int dxy, int dyx, int dyy, int shift, int r, int width, int height){ +} +#endif + #define PREFETCH(name, op) \ static void name(void *mem, int stride, int h){\ const uint8_t *p= mem;\ @@ -2662,7 +2669,7 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx) SET_HPEL_FUNCS(avg, 1, 8, mmx); SET_HPEL_FUNCS(avg_no_rnd, 1, 8, mmx); - c->gmc= gmc_mmx; + c->gmc= ff_gmc_c; c->add_bytes= add_bytes_mmx; c->add_bytes_l2= add_bytes_l2_mmx;