mirror of https://git.ffmpeg.org/ffmpeg.git
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 634312a70f
)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
c7c714719e
commit
2262e53f96
|
@ -1614,7 +1614,7 @@ int ff_get_best_fcode(MpegEncContext * s, int16_t (*mv_table)[2], int type)
|
||||||
for(y=0; y<s->mb_height; y++){
|
for(y=0; y<s->mb_height; y++){
|
||||||
int x;
|
int x;
|
||||||
int xy= y*s->mb_stride;
|
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){
|
if(s->mb_type[xy] & type){
|
||||||
int mx= mv_table[xy][0];
|
int mx= mv_table[xy][0];
|
||||||
int my= mv_table[xy][1];
|
int my= mv_table[xy][1];
|
||||||
|
@ -1631,7 +1631,6 @@ int ff_get_best_fcode(MpegEncContext * s, int16_t (*mv_table)[2], int type)
|
||||||
score[j]-= 170;
|
score[j]-= 170;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
xy++;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue