diff options
| author | James Almer <jamrial@gmail.com> | 2014-07-01 18:45:21 -0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-02 03:14:36 +0200 |
| commit | 23a9edf531fdbca929dfaa494eb7b8df2b1ca338 (patch) | |
| tree | bc6740348d48f681258dcc3dc1301f523b9c14da /libswresample/resample_template.c | |
| parent | c45b7f0d806ed4120b27c02bad0242958e8414fb (diff) | |
| download | ffmpeg-23a9edf531fdbca929dfaa494eb7b8df2b1ca338.tar.gz | |
Partially revert "swr: add prototypes for resample dsp functions"
Prototypes are not needed anymore now that the x86 functions don't
include resample_template.c
The DO_RESAMPLE_ONE macro is removed for that same reason as well.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/resample_template.c')
| -rw-r--r-- | libswresample/resample_template.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libswresample/resample_template.c b/libswresample/resample_template.c index 4f1638edb1..ab546f161f 100644 --- a/libswresample/resample_template.c +++ b/libswresample/resample_template.c @@ -70,7 +70,6 @@ #endif -#if DO_RESAMPLE_ONE static void RENAME(resample_one)(DELEM *dst, const DELEM *src, int dst_size, int64_t index2, int64_t incr) { @@ -81,11 +80,10 @@ static void RENAME(resample_one)(DELEM *dst, const DELEM *src, index2 += incr; } } -#endif -int RENAME(swri_resample_common)(ResampleContext *c, - DELEM *dst, const DELEM *src, - int n, int update_ctx) +static int RENAME(resample_common)(ResampleContext *c, + DELEM *dst, const DELEM *src, + int n, int update_ctx) { int dst_index; int index= c->index; @@ -121,9 +119,9 @@ int RENAME(swri_resample_common)(ResampleContext *c, return sample_index; } -int RENAME(swri_resample_linear)(ResampleContext *c, - DELEM *dst, const DELEM *src, - int n, int update_ctx) +static int RENAME(resample_linear)(ResampleContext *c, + DELEM *dst, const DELEM *src, + int n, int update_ctx) { int dst_index; int index= c->index; |