diff options
| author | Diego Biurrun <diego@biurrun.de> | 2016-07-13 20:14:38 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2016-07-16 17:38:37 +0200 |
| commit | facdfe40805559963b5875931af9406ed5ddcd5c (patch) | |
| tree | f7d3f96d2922bc8d241efa12509468f9f801a850 | |
| parent | c0fd2fb27bebd1d5ab028e6df6bca9119d269122 (diff) | |
| download | ffmpeg-facdfe40805559963b5875931af9406ed5ddcd5c.tar.gz | |
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>
| -rw-r--r-- | libswscale/rgb2rgb.c | 4 | ||||
| -rw-r--r-- | libswscale/rgb2rgb.h | 4 | ||||
| -rw-r--r-- | libswscale/tests/colorspace.c | 2 | ||||
| -rw-r--r-- | libswscale/utils.c | 2 | ||||
| -rw-r--r-- | libswscale/x86/rgb2rgb.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c index 3fb3921740..030416de38 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 f47b04ef0d..f827e60036 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 962b11a857..23a1945401 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 d549348e35..ba65e2a455 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 4dcd87c4ae..c6635b4a79 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(); |