diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2022-02-08 21:38:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2022-02-16 20:11:55 +0100 |
| commit | a198d7ab26a8b9756b71d20c1075957fb2fc2bc0 (patch) | |
| tree | 9b89c72fc7f4eccccf27c527f17be5b49d76008e | |
| parent | fbffe564768373335d5f4ecc1f1278ab06a1ff92 (diff) | |
| download | ffmpeg-a198d7ab26a8b9756b71d20c1075957fb2fc2bc0.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 25b606f819..5fb5e5e6e7 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++; } } |