summaryrefslogtreecommitdiff
path: root/libswresample/resample_dsp.c
diff options
context:
space:
mode:
Diffstat (limited to 'libswresample/resample_dsp.c')
-rw-r--r--libswresample/resample_dsp.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/libswresample/resample_dsp.c b/libswresample/resample_dsp.c
index 41369f3f8a..6ffbb87766 100644
--- a/libswresample/resample_dsp.c
+++ b/libswresample/resample_dsp.c
@@ -48,19 +48,23 @@ void swri_resample_dsp_init(ResampleContext *c)
switch(c->format){
case AV_SAMPLE_FMT_S16P:
c->dsp.resample_one = resample_one_int16;
- c->dsp.resample = c->linear ? resample_linear_int16 : resample_common_int16;
+ c->dsp.resample_common = resample_common_int16;
+ c->dsp.resample_linear = resample_linear_int16;
break;
case AV_SAMPLE_FMT_S32P:
c->dsp.resample_one = resample_one_int32;
- c->dsp.resample = c->linear ? resample_linear_int32 : resample_common_int32;
+ c->dsp.resample_common = resample_common_int32;
+ c->dsp.resample_linear = resample_linear_int32;
break;
case AV_SAMPLE_FMT_FLTP:
c->dsp.resample_one = resample_one_float;
- c->dsp.resample = c->linear ? resample_linear_float : resample_common_float;
+ c->dsp.resample_common = resample_common_float;
+ c->dsp.resample_linear = resample_linear_float;
break;
case AV_SAMPLE_FMT_DBLP:
c->dsp.resample_one = resample_one_double;
- c->dsp.resample = c->linear ? resample_linear_double : resample_common_double;
+ c->dsp.resample_common = resample_common_double;
+ c->dsp.resample_linear = resample_linear_double;
break;
}