RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

swresample: Add prefix to soxr_resampler 

also move declaration to header

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-02-27 19:20:43 +01:00
parent bf6102044d
commit 4d00860ac7
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libswresample/soxr_resample.c
View File

@ -97,7 +97,7 @@ static int invert_initial_buffer(struct ResampleContext *c, AudioData *dst, cons
return 0; return 0;
} }
struct Resampler const soxr_resampler={ struct Resampler const swri_soxr_resampler={
create, destroy, process, flush, NULL /* set_compensation */, get_delay, create, destroy, process, flush, NULL /* set_compensation */, get_delay,
invert_initial_buffer, invert_initial_buffer,
}; };

3
libswresample/swresample.c
View File

@ -176,8 +176,7 @@ av_cold int swr_init(struct SwrContext *s){
switch(s->engine){ switch(s->engine){
#if CONFIG_LIBSOXR #if CONFIG_LIBSOXR
extern struct Resampler const soxr_resampler; case SWR_ENGINE_SOXR: s->resampler = &swri_soxr_resampler; break;
case SWR_ENGINE_SOXR: s->resampler = &soxr_resampler; break;
#endif #endif
case SWR_ENGINE_SWR : s->resampler = &swri_resampler; break; case SWR_ENGINE_SWR : s->resampler = &swri_resampler; break;
default: default:

2
libswresample/swresample_internal.h
View File

@ -88,6 +88,7 @@ struct Resampler {
}; };
extern struct Resampler const swri_resampler; extern struct Resampler const swri_resampler;
extern struct Resampler const swri_soxr_resampler;
struct SwrContext { struct SwrContext {
const AVClass *av_class; ///< AVClass used for AVOption and av_log() 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 out_fmt,
enum AVSampleFormat in_fmt, enum AVSampleFormat in_fmt,
int channels); int channels);
#endif #endif