Commit 2391e464 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/mpegvideo: Fix undefined shift in ff_mpv_lowest_referenced_row()

Also moves the shift out of the inner loop

Found-by: Clang -fsanitize=shift
Reported-by: 's avatarThierry Foucu <tfoucu@google.com>
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 9b2a964c
...@@ -2952,12 +2952,12 @@ int ff_mpv_lowest_referenced_row(MpegEncContext *s, int dir) ...@@ -2952,12 +2952,12 @@ int ff_mpv_lowest_referenced_row(MpegEncContext *s, int dir)
} }
for (i = 0; i < mvs; i++) { for (i = 0; i < mvs; i++) {
my = s->mv[dir][i][1]<<qpel_shift; my = s->mv[dir][i][1];
my_max = FFMAX(my_max, my); my_max = FFMAX(my_max, my);
my_min = FFMIN(my_min, my); my_min = FFMIN(my_min, my);
} }
off = (FFMAX(-my_min, my_max) + 63) >> 6; off = ((FFMAX(-my_min, my_max)<<qpel_shift) + 63) >> 6;
return FFMIN(FFMAX(s->mb_y + off, 0), s->mb_height-1); return FFMIN(FFMAX(s->mb_y + off, 0), s->mb_height-1);
unhandled: unhandled:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment