diff options
| author | James Almer <jamrial@gmail.com> | 2014-07-02 00:05:08 -0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-02 13:18:30 +0200 |
| commit | b5f0eac0689bb7837a53486a4c2e576d71555ab6 (patch) | |
| tree | d64b67d961a5b72acb2c3a67754b89168387f44a /libswresample | |
| parent | 1619a0e2b8fdb873c43f0878da9f7dbe363314dc (diff) | |
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>
Diffstat (limited to 'libswresample')
| -rw-r--r-- | libswresample/resample.c | 2 | ||||
| -rw-r--r-- | libswresample/resample.h | 4 | ||||
| -rw-r--r-- | libswresample/resample_dsp.c | 4 | ||||
| -rw-r--r-- | libswresample/x86/resample_x86_dsp.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/libswresample/resample.c b/libswresample/resample.c index ffb03f034e..6124b8a035 100644 --- 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 b484ceb328..bf00175d79 100644 --- 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 b792d420ca..f12b6b171a 100644 --- 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 c030b8c825..e32b6ee341 100644 --- 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(); |