diff --git a/libswscale/colorspace-test.c b/libswscale/colorspace-test.c index 42a915bfe6f91447b012a6f0934df72ae1ff7469..f6e0c920cd39332afa19d8a22caa507404a110e8 100644 --- a/libswscale/colorspace-test.c +++ b/libswscale/colorspace-test.c @@ -45,7 +45,7 @@ int main(int argc, char **argv) return -1; av_log(NULL, AV_LOG_INFO, "memory corruption test ...\n"); - sws_rgb2rgb_init(); + ff_sws_rgb2rgb_init(); for (funcNum = 0; ; funcNum++) { struct func_info_s { diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c index 340174fd659bc487e1308234c97c0ec77cd95161..f7f8188af1a3b7a4e08d3d6323ac96ffd2dba98d 100644 --- a/libswscale/rgb2rgb.c +++ b/libswscale/rgb2rgb.c @@ -130,7 +130,7 @@ void (*yuyvtoyuv422)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, * 32-bit C version, and and&add trick by Michael Niedermayer */ -av_cold void sws_rgb2rgb_init(void) +av_cold void ff_sws_rgb2rgb_init(void) { rgb2rgb_init_c(); if (ARCH_X86) diff --git a/libswscale/rgb2rgb.h b/libswscale/rgb2rgb.h index 8faebe6a438c4d44dca3d7fee11b2681c40daf9a..0645404eee7e0194b1533ad060fb4f7c3a1d7a54 100644 --- a/libswscale/rgb2rgb.h +++ b/libswscale/rgb2rgb.h @@ -164,7 +164,7 @@ extern void (*yuyvtoyuv422)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, const u int width, int height, int lumStride, int chromStride, int srcStride); -void sws_rgb2rgb_init(void); +void ff_sws_rgb2rgb_init(void); void rgb2rgb_init_x86(void); diff --git a/libswscale/utils.c b/libswscale/utils.c index 037683c3d23d04af09e18893bb3346ffd4efbc02..a3fa25a910d05d751cf6d074a5b63a650055653a 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1127,7 +1127,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, flags = c->flags; emms_c(); if (!rgb15to16) - sws_rgb2rgb_init(); + ff_sws_rgb2rgb_init(); unscaled = (srcW == dstW && srcH == dstH);