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>
pull/249/head
Diego Biurrun 9 years ago
parent c0fd2fb27b
commit facdfe4080
  1. 4
      libswscale/rgb2rgb.c
  2. 4
      libswscale/rgb2rgb.h
  3. 2
      libswscale/tests/colorspace.c
  4. 2
      libswscale/utils.c
  5. 2
      libswscale/x86/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 * 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(); rgb2rgb_init_c();
if (ARCH_X86) if (ARCH_X86)
rgb2rgb_init_x86(); ff_rgb2rgb_init_x86();
} }
void rgb32to24(const uint8_t *src, uint8_t *dst, int src_size) void rgb32to24(const uint8_t *src, uint8_t *dst, int src_size)

@ -158,8 +158,8 @@ extern void (*yuyvtoyuv422)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, const u
int width, int height, int width, int height,
int lumStride, int chromStride, int srcStride); 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 */ #endif /* SWSCALE_RGB2RGB_H */

@ -46,7 +46,7 @@ int main(void)
return -1; return -1;
av_log(NULL, AV_LOG_INFO, "memory corruption test ...\n"); av_log(NULL, AV_LOG_INFO, "memory corruption test ...\n");
sws_rgb2rgb_init(); ff_rgb2rgb_init();
for (funcNum = 0; ; funcNum++) { for (funcNum = 0; ; funcNum++) {
struct func_info_s { struct func_info_s {

@ -897,7 +897,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter,
flags = c->flags; flags = c->flags;
emms_c(); emms_c();
if (!rgb15to16) if (!rgb15to16)
sws_rgb2rgb_init(); ff_rgb2rgb_init();
unscaled = (srcW == dstW && srcH == dstH); unscaled = (srcW == dstW && srcH == dstH);

@ -137,7 +137,7 @@ DECLARE_ASM_CONST(8, uint64_t, blue_15mask) = 0x0000001f0000001fULL;
#endif /* HAVE_INLINE_ASM */ #endif /* HAVE_INLINE_ASM */
av_cold void rgb2rgb_init_x86(void) av_cold void ff_rgb2rgb_init_x86(void)
{ {
#if HAVE_INLINE_ASM #if HAVE_INLINE_ASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();

Loading…
Cancel
Save