# HG changeset patch # User ramiro # Date 1260006259 0 # Node ID ccbc4361e9e6657d0c8327f418d283ce428dd12a # Parent 95a14f94aa15d5e4f931299546d4350d5f1c3a5a Fix compilation with runtime cpu detection. All functions in swscale_template.c should be declared with the RENAME macro. diff -r 95a14f94aa15 -r ccbc4361e9e6 libswscale/swscale_template.c --- a/libswscale/swscale_template.c Thu Dec 03 21:04:53 2009 +0000 +++ b/libswscale/swscale_template.c Sat Dec 05 09:44:19 2009 +0000 @@ -1818,16 +1818,16 @@ #endif } -static inline void nv12ToUV(uint8_t *dstU, uint8_t *dstV, - const uint8_t *src1, const uint8_t *src2, - long width, uint32_t *unused) +static inline void RENAME(nv12ToUV)(uint8_t *dstU, uint8_t *dstV, + const uint8_t *src1, const uint8_t *src2, + long width, uint32_t *unused) { RENAME(nvXXtoUV)(dstU, dstV, src1, width); } -static inline void nv21ToUV(uint8_t *dstU, uint8_t *dstV, - const uint8_t *src1, const uint8_t *src2, - long width, uint32_t *unused) +static inline void RENAME(nv21ToUV)(uint8_t *dstU, uint8_t *dstV, + const uint8_t *src1, const uint8_t *src2, + long width, uint32_t *unused) { RENAME(nvXXtoUV)(dstV, dstU, src1, width); } @@ -2962,8 +2962,8 @@ switch(srcFormat) { case PIX_FMT_YUYV422 : c->hcscale_internal = RENAME(yuy2ToUV); break; case PIX_FMT_UYVY422 : c->hcscale_internal = RENAME(uyvyToUV); break; - case PIX_FMT_NV12 : c->hcscale_internal = nv12ToUV; break; - case PIX_FMT_NV21 : c->hcscale_internal = nv21ToUV; break; + case PIX_FMT_NV12 : c->hcscale_internal = RENAME(nv12ToUV); break; + case PIX_FMT_NV21 : c->hcscale_internal = RENAME(nv21ToUV); break; case PIX_FMT_RGB8 : case PIX_FMT_BGR8 : case PIX_FMT_PAL8 :