From ddb7b4435a84bcc53018eb802fec675f75d242c7 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sat, 28 Jun 2014 08:00:05 -0400 Subject: [PATCH] swr: move dst_size == 0 handling outside DSP function. Signed-off-by: Michael Niedermayer --- libswresample/resample.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libswresample/resample.c b/libswresample/resample.c index 81dec7df69..ffb03f034e 100644 --- a/libswresample/resample.c +++ b/libswresample/resample.c @@ -297,10 +297,14 @@ static int swri_resample(ResampleContext *c, int delta_n = (delta_frac + c->dst_incr - 1) / c->dst_incr; dst_size = FFMIN(dst_size, delta_n); - if (!c->linear) { - *consumed = c->dsp.resample_common[fn_idx](c, dst, src, dst_size, update_ctx); + if (dst_size > 0) { + if (!c->linear) { + *consumed = c->dsp.resample_common[fn_idx](c, dst, src, dst_size, update_ctx); + } else { + *consumed = c->dsp.resample_linear[fn_idx](c, dst, src, dst_size, update_ctx); + } } else { - *consumed = c->dsp.resample_linear[fn_idx](c, dst, src, dst_size, update_ctx); + *consumed = 0; } }