From 3aa682f25324d811ec284edc808eb71a46eae950 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Tue, 20 Aug 2013 10:48:40 +0200
Subject: [PATCH] swscale: consistent names for arch-specific acceleration
functions
---
libswscale/bfin/swscale_bfin.c | 2 +-
libswscale/bfin/yuv2rgb_bfin.c | 2 +-
libswscale/ppc/yuv2yuv_altivec.c | 2 +-
libswscale/swscale_internal.h | 7 +++----
libswscale/swscale_unscaled.c | 4 ++--
libswscale/yuv2rgb.c | 2 +-
6 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/libswscale/bfin/swscale_bfin.c b/libswscale/bfin/swscale_bfin.c
index 9d0bbe3e2af..d4980e5d71f 100644
--- a/libswscale/bfin/swscale_bfin.c
+++ b/libswscale/bfin/swscale_bfin.c
@@ -71,7 +71,7 @@ static int yuyvtoyv12_unscaled(SwsContext *c, const uint8_t *src[],
return srcSliceH;
}
-void ff_bfin_get_unscaled_swscale(SwsContext *c)
+void ff_get_unscaled_swscale_bfin(SwsContext *c)
{
if (c->dstFormat == AV_PIX_FMT_YUV420P && c->srcFormat == AV_PIX_FMT_UYVY422) {
av_log(NULL, AV_LOG_VERBOSE,
diff --git a/libswscale/bfin/yuv2rgb_bfin.c b/libswscale/bfin/yuv2rgb_bfin.c
index 5b74c7a5167..6c3496d7ce3 100644
--- a/libswscale/bfin/yuv2rgb_bfin.c
+++ b/libswscale/bfin/yuv2rgb_bfin.c
@@ -167,7 +167,7 @@ static int bfin_yuv420_bgr565(SwsContext *c, const uint8_t **in, int *instrides,
outstrides, ff_bfin_yuv2rgb565_line, 0, 565);
}
-SwsFunc ff_yuv2rgb_get_func_ptr_bfin(SwsContext *c)
+SwsFunc ff_yuv2rgb_init_bfin(SwsContext *c)
{
SwsFunc f;
diff --git a/libswscale/ppc/yuv2yuv_altivec.c b/libswscale/ppc/yuv2yuv_altivec.c
index 9a7177bb5c0..659840b9390 100644
--- a/libswscale/ppc/yuv2yuv_altivec.c
+++ b/libswscale/ppc/yuv2yuv_altivec.c
@@ -183,7 +183,7 @@ static int yv12touyvy_unscaled_altivec(SwsContext *c, const uint8_t *src[],
#endif /* HAVE_ALTIVEC */
-void ff_swscale_get_unscaled_ppc(SwsContext *c)
+void ff_get_unscaled_swscale_ppc(SwsContext *c)
{
#if HAVE_ALTIVEC
if ((av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) && !(c->srcW & 15) &&
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index a52626cbd5d..6129893f828 100644
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -573,8 +573,7 @@ void updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrBufI
SwsFunc ff_yuv2rgb_init_x86(SwsContext *c);
SwsFunc ff_yuv2rgb_init_vis(SwsContext *c);
SwsFunc ff_yuv2rgb_init_ppc(SwsContext *c);
-SwsFunc ff_yuv2rgb_get_func_ptr_bfin(SwsContext *c);
-void ff_bfin_get_unscaled_swscale(SwsContext *c);
+SwsFunc ff_yuv2rgb_init_bfin(SwsContext *c);
const char *sws_format_name(enum AVPixelFormat format);
@@ -735,8 +734,8 @@ extern const AVClass sws_context_class;
* source and destination formats, bit depths, flags, etc.
*/
void ff_get_unscaled_swscale(SwsContext *c);
-
-void ff_swscale_get_unscaled_ppc(SwsContext *c);
+void ff_get_unscaled_swscale_bfin(SwsContext *c);
+void ff_get_unscaled_swscale_ppc(SwsContext *c);
/**
* Return function pointer to fastest main scaler path function depending
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index 88bd3802aa1..7333d5fd0b3 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -1090,9 +1090,9 @@ void ff_get_unscaled_swscale(SwsContext *c)
}
if (ARCH_BFIN)
- ff_bfin_get_unscaled_swscale(c);
+ ff_get_unscaled_swscale_bfin(c);
if (ARCH_PPC)
- ff_swscale_get_unscaled_ppc(c);
+ ff_get_unscaled_swscale_ppc(c);
}
static void reset_ptr(const uint8_t *src[], int format)
diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c
index 84e3e9c50e0..00af4ee836b 100644
--- a/libswscale/yuv2rgb.c
+++ b/libswscale/yuv2rgb.c
@@ -565,7 +565,7 @@ SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c)
else if (HAVE_VIS)
t = ff_yuv2rgb_init_vis(c);
else if (ARCH_BFIN)
- t = ff_yuv2rgb_get_func_ptr_bfin(c);
+ t = ff_yuv2rgb_init_bfin(c);
else if (ARCH_PPC)
t = ff_yuv2rgb_init_ppc(c);
--
GitLab