swr: rename swresample_dsp init functions to swri_resample_dsp

The swresample_ prefix is not for internal functions

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/libswresample/resample.c b/libswresample/resample.c
index ffb03f034e2f98548d7f981ac01b016db7bd2370..6124b8a03584f975b3cae5022edd16a8cd09660c 100644 (file)
--- a/libswresample/resample.c
+++ b/libswresample/resample.c
@@ -238,7 +238,7 @@ static ResampleContext *resample_init(ResampleContext *c, int out_rate, int in_r
     c->index= -phase_count*((c->filter_length-1)/2);
     c->frac= 0;
 
-    swresample_dsp_init(c);
+    swri_resample_dsp_init(c);
 
     return c;
 error:

diff --git a/libswresample/resample.h b/libswresample/resample.h
index b484ceb3285579db6940134fcbbec447851d9582..bf00175d79164543c11a7fceaa159199ddf84a74 100644 (file)
--- a/libswresample/resample.h
+++ b/libswresample/resample.h
@@ -62,7 +62,7 @@ typedef struct ResampleContext {
     } dsp;
 } ResampleContext;
 
-void swresample_dsp_init(ResampleContext *c);
-void swresample_dsp_x86_init(ResampleContext *c);
+void swri_resample_dsp_init(ResampleContext *c);
+void swri_resample_dsp_x86_init(ResampleContext *c);
 
 #endif /* SWRESAMPLE_RESAMPLE_H */

diff --git a/libswresample/resample_dsp.c b/libswresample/resample_dsp.c
index b792d420ca823a1289c3e91457b9b4bc1599f667..f12b6b171a77f81eb36106392dc2e2fc96cdc882 100644 (file)
--- a/libswresample/resample_dsp.c
+++ b/libswresample/resample_dsp.c
@@ -43,7 +43,7 @@
 #include "resample_template.c"
 #undef TEMPLATE_RESAMPLE_DBL
 
-void swresample_dsp_init(ResampleContext *c)
+void swri_resample_dsp_init(ResampleContext *c)
 {
 #define FNIDX(fmt) (AV_SAMPLE_FMT_##fmt - AV_SAMPLE_FMT_S16P)
     c->dsp.resample_one[FNIDX(S16P)] = (resample_one_fn) resample_one_int16;
@@ -61,5 +61,5 @@ void swresample_dsp_init(ResampleContext *c)
     c->dsp.resample_linear[FNIDX(FLTP)] = (resample_fn) resample_linear_float;
     c->dsp.resample_linear[FNIDX(DBLP)] = (resample_fn) resample_linear_double;
 
-    if (ARCH_X86) swresample_dsp_x86_init(c);
+    if (ARCH_X86) swri_resample_dsp_x86_init(c);
 }

diff --git a/libswresample/x86/resample_x86_dsp.c b/libswresample/x86/resample_x86_dsp.c
index c030b8c825ad8a29a591852dfc5e769e867adbeb..e32b6ee341e4001797b38f1bf78e98ecf483b3ef 100644 (file)
--- a/libswresample/x86/resample_x86_dsp.c
+++ b/libswresample/x86/resample_x86_dsp.c
@@ -42,7 +42,7 @@ RESAMPLE_FUNCS(float,  fma3);
 RESAMPLE_FUNCS(float,  fma4);
 RESAMPLE_FUNCS(double, sse2);
 
-void swresample_dsp_x86_init(ResampleContext *c)
+void swri_resample_dsp_x86_init(ResampleContext *c)
 {
     int av_unused mm_flags = av_get_cpu_flags();