Browse Source

swscale: rename sws_rgb2rgb_init to ff_sws_rgb2rgb_init

It is an internal swscale function and thus should not be exported.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
tags/n3.0
Andreas Cadhalpun 9 years ago
parent
commit
e8c3716064
4 changed files with 4 additions and 4 deletions
  1. +1
    -1
      libswscale/colorspace-test.c
  2. +1
    -1
      libswscale/rgb2rgb.c
  3. +1
    -1
      libswscale/rgb2rgb.h
  4. +1
    -1
      libswscale/utils.c

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

@@ -45,7 +45,7 @@ int main(int argc, char **argv)
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_sws_rgb2rgb_init();


for (funcNum = 0; ; funcNum++) { for (funcNum = 0; ; funcNum++) {
struct func_info_s { struct func_info_s {


+ 1
- 1
libswscale/rgb2rgb.c View File

@@ -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 * 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(); rgb2rgb_init_c();
if (ARCH_X86) if (ARCH_X86)


+ 1
- 1
libswscale/rgb2rgb.h View File

@@ -164,7 +164,7 @@ 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_sws_rgb2rgb_init(void);


void rgb2rgb_init_x86(void); void rgb2rgb_init_x86(void);




+ 1
- 1
libswscale/utils.c View File

@@ -1127,7 +1127,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_sws_rgb2rgb_init();


unscaled = (srcW == dstW && srcH == dstH); unscaled = (srcW == dstW && srcH == dstH);




Loading…
Cancel
Save