From 71c2a70cbfbb5fea6dffa5e462b0227565e29bcc Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 23 Mar 2012 21:56:42 +0100 Subject: [PATCH] error_concealment: Prevent FPEs in case of corrupted input. Signed-off-by: Michael Niedermayer --- libavcodec/error_resilience.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index cd6aa01803..c93cea58dc 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -248,7 +248,7 @@ static void guess_dc(MpegEncContext *s, int16_t *dc, int w, weight_sum = 0; guess = 0; for (j = 0; j < 4; j++) { - int64_t weight = 256 * 256 * 256 * 16 / dist[b_x + b_y*stride][j]; + int64_t weight = 256 * 256 * 256 * 16 / FFMAX(dist[b_x + b_y*stride][j], 1); guess += weight*(int64_t)col[b_x + b_y*stride][j]; weight_sum += weight; }