RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Cédric Schieli 2009-03-24 07:09:19 +00:00
parent da1e126e0d
commit 0928f1eb53
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libswscale/yuv2rgb.c
View File

@ -508,11 +508,8 @@ SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c)
switch (c->dstFormat) { switch (c->dstFormat) {
case PIX_FMT_RGB32: case PIX_FMT_RGB32:
if (CONFIG_SWSCALE_ALPHA && c->srcFormat == PIX_FMT_YUVA420P){ if (CONFIG_SWSCALE_ALPHA && c->srcFormat == PIX_FMT_YUVA420P){
#if HAVE_7REGS if (HAVE_7REGS) return yuva420_rgb32_MMX2;
return yuva420_rgb32_MMX2;
#else
break; break;
#endif
}else return yuv420_rgb32_MMX2; }else return yuv420_rgb32_MMX2;
case PIX_FMT_BGR24: return yuv420_rgb24_MMX2; case PIX_FMT_BGR24: return yuv420_rgb24_MMX2;
case PIX_FMT_RGB565: return yuv420_rgb16_MMX2; case PIX_FMT_RGB565: return yuv420_rgb16_MMX2;
@ -523,11 +520,8 @@ SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c)
switch (c->dstFormat) { switch (c->dstFormat) {
case PIX_FMT_RGB32: case PIX_FMT_RGB32:
if (CONFIG_SWSCALE_ALPHA && c->srcFormat == PIX_FMT_YUVA420P){ if (CONFIG_SWSCALE_ALPHA && c->srcFormat == PIX_FMT_YUVA420P){
#if HAVE_7REGS if (HAVE_7REGS) return yuva420_rgb32_MMX;
return yuva420_rgb32_MMX;
#else
break; break;
#endif
}else return yuv420_rgb32_MMX; }else return yuv420_rgb32_MMX;
case PIX_FMT_BGR24: return yuv420_rgb24_MMX; case PIX_FMT_BGR24: return yuv420_rgb24_MMX;
case PIX_FMT_RGB565: return yuv420_rgb16_MMX; case PIX_FMT_RGB565: return yuv420_rgb16_MMX;

4
libswscale/yuv2rgb_template.c
View File

@ -465,9 +465,9 @@ static inline int RENAME(yuv420_rgb32)(SwsContext *c, uint8_t* src[], int srcStr
YUV2RGB_OPERANDS YUV2RGB_OPERANDS
} }
#if HAVE_7REGS
static inline int RENAME(yuva420_rgb32)(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, static inline int RENAME(yuva420_rgb32)(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dst[], int dstStride[]){ int srcSliceH, uint8_t* dst[], int dstStride[]){
#if HAVE_7REGS
int y, h_size; int y, h_size;
YUV2RGB_LOOP(4) YUV2RGB_LOOP(4)
@ -480,5 +480,5 @@ static inline int RENAME(yuva420_rgb32)(SwsContext *c, uint8_t* src[], int srcSt
YUV2RGB_ENDLOOP(4) YUV2RGB_ENDLOOP(4)
YUV2RGB_OPERANDS_ALPHA YUV2RGB_OPERANDS_ALPHA
}
#endif #endif
}