diff options
| author | Cédric Schieli <cschieli@gmail.com> | 2009-03-21 12:16:32 +0000 |
|---|---|---|
| committer | Cédric Schieli <cschieli@gmail.com> | 2009-03-21 12:16:32 +0000 |
| commit | 986b6f8f7360215bea51dc66ae97412ac67c136e (patch) | |
| tree | e8366da6a50905f9072a948ec8fd755d7796457f /libswscale | |
| parent | 64159a588b505d879c57078d223d8e617a36ff04 (diff) | |
| download | ffmpeg-986b6f8f7360215bea51dc66ae97412ac67c136e.tar.gz | |
Fix build failure on x86_32 Mac OS X with PIC enabled
Originally committed as revision 29022 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/yuv2rgb.c | 12 | ||||
| -rw-r--r-- | libswscale/yuv2rgb_template.c | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c index 00ed99b79a..dbdf9d99b2 100644 --- a/libswscale/yuv2rgb.c +++ b/libswscale/yuv2rgb.c @@ -508,7 +508,11 @@ SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c) 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 @@ SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c) 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; diff --git a/libswscale/yuv2rgb_template.c b/libswscale/yuv2rgb_template.c index 29d6cb7371..ec5aa0d263 100644 --- a/libswscale/yuv2rgb_template.c +++ b/libswscale/yuv2rgb_template.c @@ -465,6 +465,7 @@ static inline int RENAME(yuv420_rgb32)(SwsContext *c, uint8_t* src[], int srcStr 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 @@ static inline int RENAME(yuva420_rgb32)(SwsContext *c, uint8_t* src[], int srcSt YUV2RGB_ENDLOOP(4) YUV2RGB_OPERANDS_ALPHA } +#endif |