Commit a30a8bee authored by Ronald S. Bultje's avatar Ronald S. Bultje

vp9: Fix emu[] edge overflow conditions for >8bpp/non-420.

parent 2563a338
...@@ -3301,9 +3301,9 @@ static void decode_b(AVCodecContext *ctx, int row, int col, ...@@ -3301,9 +3301,9 @@ static void decode_b(AVCodecContext *ctx, int row, int col,
// emulated overhangs if the stride of the target buffer can't hold. This // emulated overhangs if the stride of the target buffer can't hold. This
// makes it possible to support emu-edge and so on even if we have large block // makes it possible to support emu-edge and so on even if we have large block
// overhangs // overhangs
emu[0] = (col + w4) * 8 > f->linesize[0] || emu[0] = (col + w4) * 8 * bytesperpixel > f->linesize[0] ||
(row + h4) > s->rows; (row + h4) > s->rows;
emu[1] = (col + w4) * 4 > f->linesize[1] || emu[1] = ((col + w4) * 8 >> s->ss_h) * bytesperpixel > f->linesize[1] ||
(row + h4) > s->rows; (row + h4) > s->rows;
if (emu[0]) { if (emu[0]) {
s->dst[0] = s->tmp_y; s->dst[0] = s->tmp_y;
......
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