Mercurial > mplayer.hg
changeset 28987:d78fdafe0def
Fix build failure on x86_32 Mac OS X with PIC enabled
| author | sdrik |
|---|---|
| date | Sat, 21 Mar 2009 12:16:32 +0000 |
| parents | ced556e1595a |
| children | 94a502c210a0 |
| files | libswscale/yuv2rgb.c libswscale/yuv2rgb_template.c |
| diffstat | 2 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libswscale/yuv2rgb.c Sat Mar 21 10:20:16 2009 +0000 +++ b/libswscale/yuv2rgb.c Sat Mar 21 12:16:32 2009 +0000 @@ -508,7 +508,11 @@ switch (c->dstFormat) { case PIX_FMT_RGB32: if (CONFIG_SWSCALE_ALPHA && c->srcFormat == PIX_FMT_YUVA420P){ - if (HAVE_7REGS) return yuva420_rgb32_MMX2; +#if HAVE_7REGS + return yuva420_rgb32_MMX2; +#else + break; +#endif }else return yuv420_rgb32_MMX2; case PIX_FMT_BGR24: return yuv420_rgb24_MMX2; case PIX_FMT_RGB565: return yuv420_rgb16_MMX2; @@ -519,7 +523,11 @@ switch (c->dstFormat) { case PIX_FMT_RGB32: if (CONFIG_SWSCALE_ALPHA && c->srcFormat == PIX_FMT_YUVA420P){ - if (HAVE_7REGS) return yuva420_rgb32_MMX; +#if HAVE_7REGS + return yuva420_rgb32_MMX; +#else + break; +#endif }else return yuv420_rgb32_MMX; case PIX_FMT_BGR24: return yuv420_rgb24_MMX; case PIX_FMT_RGB565: return yuv420_rgb16_MMX;
--- a/libswscale/yuv2rgb_template.c Sat Mar 21 10:20:16 2009 +0000 +++ b/libswscale/yuv2rgb_template.c Sat Mar 21 12:16:32 2009 +0000 @@ -465,6 +465,7 @@ YUV2RGB_OPERANDS } +#if HAVE_7REGS static inline int RENAME(yuva420_rgb32)(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[]){ int y, h_size; @@ -480,3 +481,4 @@ YUV2RGB_ENDLOOP(4) YUV2RGB_OPERANDS_ALPHA } +#endif