aboutsummaryrefslogtreecommitdiffstats
path: root/libavresample/resample.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2014-03-04 17:12:33 +0100
committerAnton Khirnov <anton@khirnov.net>2014-04-11 16:34:02 +0200
commit254c95cdd1b669a722204a4a65974fc2523c8f83 (patch)
treedb10c45d5a728d76500aff6caef4c7d92c517167 /libavresample/resample.c
parentbe394968c81019887ef996a78a526bdd85d1e216 (diff)
downloadffmpeg-254c95cdd1b669a722204a4a65974fc2523c8f83.tar.gz
resample: split linear into its own function
Diffstat (limited to 'libavresample/resample.c')
-rw-r--r--libavresample/resample.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavresample/resample.c b/libavresample/resample.c
index c02bba472d..2aa7141850 100644
--- a/libavresample/resample.c
+++ b/libavresample/resample.c
@@ -181,22 +181,22 @@ ResampleContext *ff_audio_resample_init(AVAudioResampleContext *avr)
switch (avr->internal_sample_fmt) {
case AV_SAMPLE_FMT_DBLP:
- c->resample_one = resample_one_dbl;
+ c->resample_one = c->linear ? resample_linear_dbl : resample_one_dbl;
c->resample_nearest = resample_nearest_dbl;
c->set_filter = set_filter_dbl;
break;
case AV_SAMPLE_FMT_FLTP:
- c->resample_one = resample_one_flt;
+ c->resample_one = c->linear ? resample_linear_flt : resample_one_flt;
c->resample_nearest = resample_nearest_flt;
c->set_filter = set_filter_flt;
break;
case AV_SAMPLE_FMT_S32P:
- c->resample_one = resample_one_s32;
+ c->resample_one = c->linear ? resample_linear_s32 : resample_one_s32;
c->resample_nearest = resample_nearest_s32;
c->set_filter = set_filter_s32;
break;
case AV_SAMPLE_FMT_S16P:
- c->resample_one = resample_one_s16;
+ c->resample_one = c->linear ? resample_linear_s16 : resample_one_s16;
c->resample_nearest = resample_nearest_s16;
c->set_filter = set_filter_s16;
break;