From 0928f1eb53c8d60c6904b00b76d8d79f9f6d7634 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Schieli?= <cschieli@gmail.com>
Date: Tue, 24 Mar 2009 07:09:19 +0000
Subject: [PATCH] Simpler and more elegant fix to the x86_32/OSX+PIC build
failure
Originally committed as revision 29046 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
---
libswscale/yuv2rgb.c | 10 ++--------
libswscale/yuv2rgb_template.c | 4 ++--
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c
index dbdf9d99b21..112d4a375c6 100644
--- a/libswscale/yuv2rgb.c
+++ b/libswscale/yuv2rgb.c
@@ -508,11 +508,8 @@ 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;
-#else
+ if (HAVE_7REGS) return yuva420_rgb32_MMX2;
break;
-#endif
}else return yuv420_rgb32_MMX2;
case PIX_FMT_BGR24: return yuv420_rgb24_MMX2;
case PIX_FMT_RGB565: return yuv420_rgb16_MMX2;
@@ -523,11 +520,8 @@ 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;
-#else
+ if (HAVE_7REGS) return yuva420_rgb32_MMX;
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 ec5aa0d263b..798eff0e33c 100644
--- a/libswscale/yuv2rgb_template.c
+++ b/libswscale/yuv2rgb_template.c
@@ -465,9 +465,9 @@ 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[]){
+#if HAVE_7REGS
int y, h_size;
YUV2RGB_LOOP(4)
@@ -480,5 +480,5 @@ static inline int RENAME(yuva420_rgb32)(SwsContext *c, uint8_t* src[], int srcSt
YUV2RGB_ENDLOOP(4)
YUV2RGB_OPERANDS_ALPHA
-}
#endif
+}
--
GitLab