[FFmpeg-cvslog] r29046 - in trunk/libswscale: yuv2rgb.c yuv2rgb_template.c
sdrik
subversion
Tue Mar 24 08:09:19 CET 2009
Author: sdrik
Date: Tue Mar 24 08:09:19 2009
New Revision: 29046
Log:
Simpler and more elegant fix to the x86_32/OSX+PIC build failure
Modified:
trunk/libswscale/yuv2rgb.c
trunk/libswscale/yuv2rgb_template.c
Modified: trunk/libswscale/yuv2rgb.c
==============================================================================
--- trunk/libswscale/yuv2rgb.c Tue Mar 24 01:22:51 2009 (r29045)
+++ trunk/libswscale/yuv2rgb.c Tue Mar 24 08:09:19 2009 (r29046)
@@ -508,11 +508,8 @@ 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;
-#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(SwsConte
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;
Modified: trunk/libswscale/yuv2rgb_template.c
==============================================================================
--- trunk/libswscale/yuv2rgb_template.c Tue Mar 24 01:22:51 2009 (r29045)
+++ trunk/libswscale/yuv2rgb_template.c Tue Mar 24 08:09:19 2009 (r29046)
@@ -465,9 +465,9 @@ 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[]){
+#if HAVE_7REGS
int y, h_size;
YUV2RGB_LOOP(4)
@@ -480,5 +480,5 @@ static inline int RENAME(yuva420_rgb32)(
YUV2RGB_ENDLOOP(4)
YUV2RGB_OPERANDS_ALPHA
-}
#endif
+}
More information about the ffmpeg-cvslog
mailing list