Browse Source

swresample: Add prefix to soxr_resampler

also move declaration to header

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.6
Michael Niedermayer 10 years ago
parent
commit
4d00860ac7
3 changed files with 4 additions and 3 deletions
  1. +1
    -1
      libswresample/soxr_resample.c
  2. +1
    -2
      libswresample/swresample.c
  3. +2
    -0
      libswresample/swresample_internal.h

+ 1
- 1
libswresample/soxr_resample.c View File

@@ -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,
};


+ 1
- 2
libswresample/swresample.c View File

@@ -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:


+ 2
- 0
libswresample/swresample_internal.h View File

@@ -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

Loading…
Cancel
Save