From facdfe40805559963b5875931af9406ed5ddcd5c Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Wed, 13 Jul 2016 20:14:38 +0200
Subject: [PATCH] swscale: Add proper ff_ prefix to init functions
They are internal symbols that should not be exported.
based on a patch by Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
---
libswscale/rgb2rgb.c | 4 ++--
libswscale/rgb2rgb.h | 4 ++--
libswscale/tests/colorspace.c | 2 +-
libswscale/utils.c | 2 +-
libswscale/x86/rgb2rgb.c | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c
index 3fb3921740a..030416de380 100644
--- a/libswscale/rgb2rgb.c
+++ b/libswscale/rgb2rgb.c
@@ -129,11 +129,11 @@ 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_rgb2rgb_init(void)
{
rgb2rgb_init_c();
if (ARCH_X86)
- rgb2rgb_init_x86();
+ ff_rgb2rgb_init_x86();
}
void rgb32to24(const uint8_t *src, uint8_t *dst, int src_size)
diff --git a/libswscale/rgb2rgb.h b/libswscale/rgb2rgb.h
index f47b04ef0d6..f827e600369 100644
--- a/libswscale/rgb2rgb.h
+++ b/libswscale/rgb2rgb.h
@@ -158,8 +158,8 @@ 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_rgb2rgb_init(void);
-void rgb2rgb_init_x86(void);
+void ff_rgb2rgb_init_x86(void);
#endif /* SWSCALE_RGB2RGB_H */
diff --git a/libswscale/tests/colorspace.c b/libswscale/tests/colorspace.c
index 962b11a8570..23a19454015 100644
--- a/libswscale/tests/colorspace.c
+++ b/libswscale/tests/colorspace.c
@@ -46,7 +46,7 @@ int main(void)
return -1;
av_log(NULL, AV_LOG_INFO, "memory corruption test ...\n");
- sws_rgb2rgb_init();
+ ff_rgb2rgb_init();
for (funcNum = 0; ; funcNum++) {
struct func_info_s {
diff --git a/libswscale/utils.c b/libswscale/utils.c
index d549348e356..ba65e2a4551 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -897,7 +897,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter,
flags = c->flags;
emms_c();
if (!rgb15to16)
- sws_rgb2rgb_init();
+ ff_rgb2rgb_init();
unscaled = (srcW == dstW && srcH == dstH);
diff --git a/libswscale/x86/rgb2rgb.c b/libswscale/x86/rgb2rgb.c
index 4dcd87c4aec..c6635b4a793 100644
--- a/libswscale/x86/rgb2rgb.c
+++ b/libswscale/x86/rgb2rgb.c
@@ -137,7 +137,7 @@ DECLARE_ASM_CONST(8, uint64_t, blue_15mask) = 0x0000001f0000001fULL;
#endif /* HAVE_INLINE_ASM */
-av_cold void rgb2rgb_init_x86(void)
+av_cold void ff_rgb2rgb_init_x86(void)
{
#if HAVE_INLINE_ASM
int cpu_flags = av_get_cpu_flags();
--
GitLab