summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorramiro <ramiro@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-12-05 09:44:19 +0000
committerramiro <ramiro@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-12-05 09:44:19 +0000
commit63e520efbfd5bea0f6e613cce21467d844ba7179 (patch)
tree8d16227df3d6364ef2611b2131be80c2a8332eb7
parentc145024193f869a660826edabe3fb49287fda9aa (diff)
downloadmpv-63e520efbfd5bea0f6e613cce21467d844ba7179.tar.bz2
mpv-63e520efbfd5bea0f6e613cce21467d844ba7179.tar.xz
Fix compilation with runtime cpu detection.
All functions in swscale_template.c should be declared with the RENAME macro. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29976 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libswscale/swscale_template.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c
index 9ad7d45bad..935b8c5016 100644
--- a/libswscale/swscale_template.c
+++ b/libswscale/swscale_template.c
@@ -1818,16 +1818,16 @@ static inline void RENAME(nvXXtoUV)(uint8_t *dst1, uint8_t *dst2,
#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 @@ static void RENAME(sws_init_swScale)(SwsContext *c)
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 :