[FFmpeg-cvslog] avfilter/dctdnoiz: fix slice_h computation
Clément Bœsch
git at videolan.org
Thu Feb 12 20:23:17 CET 2015
ffmpeg | branch: release/2.5 | Clément Bœsch <u at pkh.me> | Sun Feb 8 14:27:51 2015 +0100| [3429714f3d046f4e2235848a60b6f63bd084e01f] | committer: Clément Bœsch
avfilter/dctdnoiz: fix slice_h computation
ceilf() can only work if the reminder of the division is not 0.
This fixes memory errors with for instance:
ffmpeg -f lavfi -i testsrc=s=800x500 -threads 3 -vf dctdnoiz -frames:v 1 -f null -
(cherry picked from commit eb7efaa9244720c5f2051d76d76faeec864eca7a)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3429714f3d046f4e2235848a60b6f63bd084e01f
---
libavfilter/vf_dctdnoiz.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavfilter/vf_dctdnoiz.c b/libavfilter/vf_dctdnoiz.c
index a9017b1..7246b01 100644
--- a/libavfilter/vf_dctdnoiz.c
+++ b/libavfilter/vf_dctdnoiz.c
@@ -534,7 +534,7 @@ static int config_input(AVFilterLink *inlink)
/* each slice will need to (pre & re)process the top and bottom block of
* the previous one in in addition to its processing area. This is because
* each pixel is averaged by all the surrounding blocks */
- slice_h = (int)ceilf(s->pr_height / s->nb_threads) + (s->bsize - 1) * 2;
+ slice_h = (int)ceilf(s->pr_height / (float)s->nb_threads) + (s->bsize - 1) * 2;
for (i = 0; i < s->nb_threads; i++) {
s->slices[i] = av_malloc_array(linesize, slice_h * sizeof(*s->slices[i]));
if (!s->slices[i])
More information about the ffmpeg-cvslog
mailing list