Browse Source

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>
tags/n3.3
Diego Biurrun 8 years ago
parent
commit
facdfe4080
5 changed files with 7 additions and 7 deletions
  1. +2
    -2
      libswscale/rgb2rgb.c
  2. +2
    -2
      libswscale/rgb2rgb.h
  3. +1
    -1
      libswscale/tests/colorspace.c
  4. +1
    -1
      libswscale/utils.c
  5. +1
    -1
      libswscale/x86/rgb2rgb.c

+ 2
- 2
libswscale/rgb2rgb.c View File

@@ -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)


+ 2
- 2
libswscale/rgb2rgb.h View File

@@ -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 */

+ 1
- 1
libswscale/tests/colorspace.c View File

@@ -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 {


+ 1
- 1
libswscale/utils.c View File

@@ -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);



+ 1
- 1
libswscale/x86/rgb2rgb.c View File

@@ -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();


Loading…
Cancel
Save