diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-05-16 05:10:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-05 02:40:31 +0200 |
| commit | d7ae13d47934b9dd90a2d37bb97043d1f77a0452 (patch) | |
| tree | 634b88652b31b39f57dfa0cdf0bf7daa3061dd76 | |
| parent | 1cd872a7d555bd74a53bb7538bfb7c393c04e42d (diff) | |
| download | android_external_ffmpeg-d7ae13d47934b9dd90a2d37bb97043d1f77a0452.tar.gz android_external_ffmpeg-d7ae13d47934b9dd90a2d37bb97043d1f77a0452.tar.bz2 android_external_ffmpeg-d7ae13d47934b9dd90a2d37bb97043d1f77a0452.zip | |
swresample/resample: Fix division by 0 with tap_count=1
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit feeb3a92616310b5f79191b0ef3064712c40b7d3)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libswresample/resample.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libswresample/resample.c b/libswresample/resample.c index 7888e570a3..d410432658 100644 --- a/libswresample/resample.c +++ b/libswresample/resample.c @@ -203,7 +203,7 @@ static int build_filter(ResampleContext *c, void *filter, double factor, int tap case AV_SAMPLE_FMT_S16P: for(i=0;i<tap_count;i++) ((int16_t*)filter)[ph * alloc + i] = av_clip_int16(lrintf(tab[i] * scale / norm)); - if (tap_count % 2 == 0) { + if (tap_count % 2 == 0 || tap_count == 1) { for (i = 0; i < tap_count; i++) ((int16_t*)filter)[(phase_count-ph) * alloc + tap_count-1-i] = ((int16_t*)filter)[ph * alloc + i]; } @@ -216,7 +216,7 @@ static int build_filter(ResampleContext *c, void *filter, double factor, int tap case AV_SAMPLE_FMT_S32P: for(i=0;i<tap_count;i++) ((int32_t*)filter)[ph * alloc + i] = av_clipl_int32(llrint(tab[i] * scale / norm)); - if (tap_count % 2 == 0) { + if (tap_count % 2 == 0 || tap_count == 1) { for (i = 0; i < tap_count; i++) ((int32_t*)filter)[(phase_count-ph) * alloc + tap_count-1-i] = ((int32_t*)filter)[ph * alloc + i]; } @@ -229,7 +229,7 @@ static int build_filter(ResampleContext *c, void *filter, double factor, int tap case AV_SAMPLE_FMT_FLTP: for(i=0;i<tap_count;i++) ((float*)filter)[ph * alloc + i] = tab[i] * scale / norm; - if (tap_count % 2 == 0) { + if (tap_count % 2 == 0 || tap_count == 1) { for (i = 0; i < tap_count; i++) ((float*)filter)[(phase_count-ph) * alloc + tap_count-1-i] = ((float*)filter)[ph * alloc + i]; } @@ -241,7 +241,7 @@ static int build_filter(ResampleContext *c, void *filter, double factor, int tap case AV_SAMPLE_FMT_DBLP: for(i=0;i<tap_count;i++) ((double*)filter)[ph * alloc + i] = tab[i] * scale / norm; - if (tap_count % 2 == 0) { + if (tap_count % 2 == 0 || tap_count == 1) { for (i = 0; i < tap_count; i++) ((double*)filter)[(phase_count-ph) * alloc + tap_count-1-i] = ((double*)filter)[ph * alloc + i]; } |