virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

swr: rename swresample_dsp init functions to swri_resample_dsp

Browse Source 
The swresample_ prefix is not for internal functions

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
James Almer 2014-07-02 00:05:08 -03:00 committed by Michael Niedermayer
parent 1619a0e2b8
commit b5f0eac068
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libswresample/resample.c
View File

@ -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->index= -phase_count*((c->filter_length-1)/2);
c->frac= 0; c->frac= 0;
swresample_dsp_init(c); swri_resample_dsp_init(c);
return c; return c;
error: error:

4
libswresample/resample.h
View File

@ -62,7 +62,7 @@ typedef struct ResampleContext {
} dsp; } dsp;
} ResampleContext; } ResampleContext;
void swresample_dsp_init(ResampleContext *c); void swri_resample_dsp_init(ResampleContext *c);
void swresample_dsp_x86_init(ResampleContext *c); void swri_resample_dsp_x86_init(ResampleContext *c);
#endif /* SWRESAMPLE_RESAMPLE_H */ #endif /* SWRESAMPLE_RESAMPLE_H */

4
libswresample/resample_dsp.c
View File

@ -43,7 +43,7 @@
#include "resample_template.c" #include "resample_template.c"
#undef TEMPLATE_RESAMPLE_DBL #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) #define FNIDX(fmt) (AV_SAMPLE_FMT_##fmt - AV_SAMPLE_FMT_S16P)
c->dsp.resample_one[FNIDX(S16P)] = (resample_one_fn) resample_one_int16; 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(FLTP)] = (resample_fn) resample_linear_float;
c->dsp.resample_linear[FNIDX(DBLP)] = (resample_fn) resample_linear_double; 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);
} }

2
libswresample/x86/resample_x86_dsp.c
View File

@ -42,7 +42,7 @@ RESAMPLE_FUNCS(float, fma3);
RESAMPLE_FUNCS(float, fma4); RESAMPLE_FUNCS(float, fma4);
RESAMPLE_FUNCS(double, sse2); 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(); int av_unused mm_flags = av_get_cpu_flags();