diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-04-27 18:01:51 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-04-30 11:06:03 +0200 |
| commit | 95220be1faac628d849a004644c0d102df0aa98b (patch) | |
| tree | e2af055899f8f2709fbceb772b4398ebf9fe1ede | |
| parent | 97c56ad7961ebb463dc9f76fe30b96966ad13864 (diff) | |
| download | ffmpeg-95220be1faac628d849a004644c0d102df0aa98b.tar.gz | |
indeo3: fix off by one in MV validity check
CC:libav-stable@libav.org
| -rw-r--r-- | libavcodec/indeo3.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c index 2e1bb494a7..35b1a89405 100644 --- a/libavcodec/indeo3.c +++ b/libavcodec/indeo3.c @@ -235,8 +235,8 @@ static int copy_cell(Indeo3DecodeContext *ctx, Plane *plane, Cell *cell) /* -1 because there is an extra line on top for prediction */ if ((cell->ypos << 2) + mv_y < -1 || (cell->xpos << 2) + mv_x < 0 || - ((cell->ypos + cell->height) << 2) + mv_y >= plane->height || - ((cell->xpos + cell->width) << 2) + mv_x >= plane->width) { + ((cell->ypos + cell->height) << 2) + mv_y > plane->height || + ((cell->xpos + cell->width) << 2) + mv_x > plane->width) { av_log(ctx->avctx, AV_LOG_ERROR, "Motion vectors point out of the frame.\n"); return AVERROR_INVALIDDATA; @@ -607,8 +607,8 @@ static int decode_cell(Indeo3DecodeContext *ctx, AVCodecContext *avctx, /* -1 because there is an extra line on top for prediction */ if ((cell->ypos << 2) + mv_y < -1 || (cell->xpos << 2) + mv_x < 0 || - ((cell->ypos + cell->height) << 2) + mv_y >= plane->height || - ((cell->xpos + cell->width) << 2) + mv_x >= plane->width) { + ((cell->ypos + cell->height) << 2) + mv_y > plane->height || + ((cell->xpos + cell->width) << 2) + mv_x > plane->width) { av_log(ctx->avctx, AV_LOG_ERROR, "Motion vectors point out of the frame.\n"); return AVERROR_INVALIDDATA; |