diff options
| author | Ramiro Polla <ramiro.polla@gmail.com> | 2009-12-05 09:44:19 +0000 |
|---|---|---|
| committer | Ramiro Polla <ramiro.polla@gmail.com> | 2009-12-05 09:44:19 +0000 |
| commit | e470691aa8798004bf5589871865a765cb791014 (patch) | |
| tree | cbf87575c7175ad804fa15fb5f614ec6a3bb385a | |
| parent | 6e4f40e1f4d0c074a054cacf9c4bdbe4df236762 (diff) | |
| download | ffmpeg-e470691aa8798004bf5589871865a765cb791014.tar.gz | |
Fix compilation with runtime cpu detection.
All functions in swscale_template.c should be declared with the RENAME macro.
Originally committed as revision 29976 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
| -rw-r--r-- | libswscale/swscale_template.c | 16 |
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 : |