# HG changeset patch # User ben # Date 1221322384 0 # Node ID aa795bfca46f679ef3d3e77601764706a391bd89 # Parent 7c3d535aba22ab6ebe116d7fd03f1d37f9c0e59f Fix libswscale build after r27561 if --enable-runtime-cpudetection is used. diff -r 7c3d535aba22 -r aa795bfca46f libswscale/swscale_template.c --- a/libswscale/swscale_template.c Sat Sep 13 14:23:45 2008 +0000 +++ b/libswscale/swscale_template.c Sat Sep 13 16:13:04 2008 +0000 @@ -1913,7 +1913,7 @@ BGR2UV(uint16_t, rgb15ToUV, 0, 0, 0, 0x7C00, 0x03E0, 0x001F, RU , GU<<5, BU<<10, RV , GV<<5, BV<<10, RGB2YUV_SHIFT+7) #ifdef HAVE_MMX -static inline void bgr24ToY_mmx(uint8_t *dst, uint8_t *src, long width, int srcFormat) +static inline void RENAME(bgr24ToY_mmx)(uint8_t *dst, uint8_t *src, long width, int srcFormat) { if(srcFormat == PIX_FMT_BGR24){ @@ -1966,7 +1966,7 @@ ); } -static inline void bgr24ToUV_mmx(uint8_t *dstU, uint8_t *dstV, uint8_t *src, long width, int srcFormat) +static inline void RENAME(bgr24ToUV_mmx)(uint8_t *dstU, uint8_t *dstV, uint8_t *src, long width, int srcFormat) { asm volatile( "movq 24+%4, %%mm6 \n\t" @@ -2028,7 +2028,7 @@ static inline void RENAME(bgr24ToY)(uint8_t *dst, uint8_t *src, long width) { #ifdef HAVE_MMX - bgr24ToY_mmx(dst, src, width, PIX_FMT_BGR24); + RENAME(bgr24ToY_mmx)(dst, src, width, PIX_FMT_BGR24); #else int i; for (i=0; i