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:58 +0100 |
| commit | d2afa2b033ab8560043ff7bbc4fe352a2b1ca061 (patch) | |
| tree | 52a16cfd9f611989b38a15d0764191808f2cb482 | |
| parent | e816333c55ef3624477a0d6e30fe390864b4dd13 (diff) | |
| download | ffmpeg-d2afa2b033ab8560043ff7bbc4fe352a2b1ca061.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 3df8276778..4091fd1203 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -1633,7 +1633,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]; @@ -1650,7 +1650,6 @@ int ff_get_best_fcode(MpegEncContext * s, int16_t (*mv_table)[2], int type) score[j]-= 170; } } - xy++; } } |