diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2022-02-08 21:38:50 +0100 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2022-04-13 23:39:50 +0200 |
commit | 5ead85030294e18131dc1f675ea7547babf50b8f (patch) | |
tree | 01c26cfe255635402004e2298360fcc9db47257b | |
parent | 07b7a4be0ad847e4a05a31ba85092ceaec4faccf (diff) | |
download | ffmpeg-5ead85030294e18131dc1f675ea7547babf50b8f.tar.gz |
avcodec/motion_est: Fix xy indexing on range violation in ff_get_best_fcode()
This codepath seems untested, no testcases change
Found-by: <mkver>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 634312a70f4d5afd40058c52b4d8eade1da07a70)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r-- | libavcodec/motion_est.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 316d16a77b..310925c2da 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -1634,7 +1634,7 @@ int ff_get_best_fcode(MpegEncContext * s, int16_t (*mv_table)[2], int type) for(y=0; y<s->mb_height; y++){ int x; int xy= y*s->mb_stride; - for(x=0; x<s->mb_width; x++){ + for(x=0; x<s->mb_width; x++, xy++){ if(s->mb_type[xy] & type){ int mx= mv_table[xy][0]; int my= mv_table[xy][1]; @@ -1651,7 +1651,6 @@ int ff_get_best_fcode(MpegEncContext * s, int16_t (*mv_table)[2], int type) score[j]-= 170; } } - xy++; } } |