From 9a3eaeebad8bd0b62d76680d5895a4bdeb228ae4 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 8 May 2009 15:14:36 +0000 Subject: [PATCH] Correct x/ymin to avoid segfault due to out of picture reads. Originally committed as revision 18771 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/snow.c | 8 ++++---- tests/ffmpeg.regression.ref | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 995c1a2024..5a1a6683b4 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -1807,10 +1807,10 @@ static int encode_q_branch(SnowContext *s, int level, int x, int y){ c->mb_penalty_factor = get_penalty_factor(s->lambda, s->lambda2, c->avctx->mb_cmp); c->current_mv_penalty= c->mv_penalty[s->m.f_code=1] + MAX_MV; - c->xmin = - x*block_w - 16+2; - c->ymin = - y*block_w - 16+2; - c->xmax = - (x+1)*block_w + (w<<(LOG2_MB_SIZE - s->block_max_depth)) + 16-2; - c->ymax = - (y+1)*block_w + (h<<(LOG2_MB_SIZE - s->block_max_depth)) + 16-2; + c->xmin = - x*block_w - 16+3; + c->ymin = - y*block_w - 16+3; + c->xmax = - (x+1)*block_w + (w<<(LOG2_MB_SIZE - s->block_max_depth)) + 16-3; + c->ymax = - (y+1)*block_w + (h<<(LOG2_MB_SIZE - s->block_max_depth)) + 16-3; if(P_LEFT[0] > (c->xmax<xmax< (c->ymax<ymax<