aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-09-10 18:52:48 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2020-09-10 23:31:10 +0200
commit6d71a25cc460960c49997d52c1d1f1c39ccc38b4 (patch)
tree28c662257a1e39152041dabc65ef125ccbdaa85a
parent64917ea6cff4022c2b3e08b58b0e4795614aa8cf (diff)
downloadffmpeg-6d71a25cc460960c49997d52c1d1f1c39ccc38b4.tar.gz
avcodec/agm: Fix off by 1 error in decode_inter_plane()
Fixes: Regression since 1f2096945709a32315da740691b5716da55893c3 Found-by: Paul B Mahol <onemda@gmail.com> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/agm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/agm.c b/libavcodec/agm.c
index 19490c5456..f60cbf1a18 100644
--- a/libavcodec/agm.c
+++ b/libavcodec/agm.c
@@ -423,8 +423,8 @@ static int decode_inter_plane(AGMContext *s, GetBitContext *gb, int size,
int map = s->map[x];
if (orig_mv_x >= -32) {
- if (y * 8 + mv_y < 0 || y * 8 + mv_y + 8 >= h ||
- x * 8 + mv_x < 0 || x * 8 + mv_x + 8 >= w)
+ if (y * 8 + mv_y < 0 || y * 8 + mv_y + 8 > h ||
+ x * 8 + mv_x < 0 || x * 8 + mv_x + 8 > w)
return AVERROR_INVALIDDATA;
copy_block8(frame->data[plane] + (s->blocks_h - 1 - y) * 8 * frame->linesize[plane] + x * 8,