[FFmpeg-cvslog] r29022 - in trunk/libswscale: yuv2rgb.c yuv2rgb_template.c

[sdrik]

Author: sdrik
Date: Sat Mar 21 13:16:32 2009
New Revision: 29022

Log:
Fix build failure on x86_32 Mac OS X with PIC enabled

Modified:
   trunk/libswscale/yuv2rgb.c
   trunk/libswscale/yuv2rgb_template.c

Modified: trunk/libswscale/yuv2rgb.c
==============================================================================
--- trunk/libswscale/yuv2rgb.c	Sat Mar 21 11:20:16 2009	(r29021)
+++ trunk/libswscale/yuv2rgb.c	Sat Mar 21 13:16:32 2009	(r29022)
@@ -508,7 +508,11 @@ SwsFunc ff_yuv2rgb_get_func_ptr(SwsConte
         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(SwsConte
         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;

Modified: trunk/libswscale/yuv2rgb_template.c
==============================================================================
--- trunk/libswscale/yuv2rgb_template.c	Sat Mar 21 11:20:16 2009	(r29021)
+++ trunk/libswscale/yuv2rgb_template.c	Sat Mar 21 13:16:32 2009	(r29022)
@@ -465,6 +465,7 @@ static inline int RENAME(yuv420_rgb32)(S
     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)(
     YUV2RGB_ENDLOOP(4)
     YUV2RGB_OPERANDS_ALPHA
 }
+#endif