diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-27 19:20:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-27 19:20:43 +0100 |
| commit | 4d00860ac79780cd6f8154f14666ddc437f0499c (patch) | |
| tree | a7f31879f6a96e92dd1d09c348802be5a911b249 /libswresample | |
| parent | bf6102044d47d2ea7b27d861672c046a32a1427b (diff) | |
| download | ffmpeg-4d00860ac79780cd6f8154f14666ddc437f0499c.tar.gz | |
swresample: Add prefix to soxr_resampler
also move declaration to header
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
| -rw-r--r-- | libswresample/soxr_resample.c | 2 | ||||
| -rw-r--r-- | libswresample/swresample.c | 3 | ||||
| -rw-r--r-- | libswresample/swresample_internal.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/libswresample/soxr_resample.c b/libswresample/soxr_resample.c index 9e87f2fc4b..0f75bc554c 100644 --- a/libswresample/soxr_resample.c +++ b/libswresample/soxr_resample.c @@ -97,7 +97,7 @@ static int invert_initial_buffer(struct ResampleContext *c, AudioData *dst, cons return 0; } -struct Resampler const soxr_resampler={ +struct Resampler const swri_soxr_resampler={ create, destroy, process, flush, NULL /* set_compensation */, get_delay, invert_initial_buffer, }; diff --git a/libswresample/swresample.c b/libswresample/swresample.c index eb6effa8ef..9baccd2b6e 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -176,8 +176,7 @@ av_cold int swr_init(struct SwrContext *s){ switch(s->engine){ #if CONFIG_LIBSOXR - extern struct Resampler const soxr_resampler; - case SWR_ENGINE_SOXR: s->resampler = &soxr_resampler; break; + case SWR_ENGINE_SOXR: s->resampler = &swri_soxr_resampler; break; #endif case SWR_ENGINE_SWR : s->resampler = &swri_resampler; break; default: diff --git a/libswresample/swresample_internal.h b/libswresample/swresample_internal.h index 3e733368b0..77ec9bb1bb 100644 --- a/libswresample/swresample_internal.h +++ b/libswresample/swresample_internal.h @@ -88,6 +88,7 @@ struct Resampler { }; extern struct Resampler const swri_resampler; +extern struct Resampler const swri_soxr_resampler; struct SwrContext { const AVClass *av_class; ///< AVClass used for AVOption and av_log() @@ -200,4 +201,5 @@ void swri_audio_convert_init_x86(struct AudioConvert *ac, enum AVSampleFormat out_fmt, enum AVSampleFormat in_fmt, int channels); + #endif |