Commit 4370f65b authored by Kostya Shishkov's avatar Kostya Shishkov Committed by Martin Storsjö

g2meet: Respect cursor_stride properly everywhere

This fixes a regression with rgb cursors since b1e46988.
Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent 5f4b1b1c
...@@ -540,6 +540,7 @@ static int g2m_load_cursor(AVCodecContext *avctx, G2MContext *c, ...@@ -540,6 +540,7 @@ static int g2m_load_cursor(AVCodecContext *avctx, G2MContext *c,
bits <<= 1; bits <<= 1;
} }
} }
dst += c->cursor_stride - c->cursor_w * 4;
} }
dst = c->cursor; dst = c->cursor;
...@@ -565,6 +566,7 @@ static int g2m_load_cursor(AVCodecContext *avctx, G2MContext *c, ...@@ -565,6 +566,7 @@ static int g2m_load_cursor(AVCodecContext *avctx, G2MContext *c,
bits <<= 1; bits <<= 1;
} }
} }
dst += c->cursor_stride - c->cursor_w * 4;
} }
break; break;
case 32: // full colour case 32: // full colour
...@@ -578,6 +580,7 @@ static int g2m_load_cursor(AVCodecContext *avctx, G2MContext *c, ...@@ -578,6 +580,7 @@ static int g2m_load_cursor(AVCodecContext *avctx, G2MContext *c,
*dst++ = val >> 16; *dst++ = val >> 16;
*dst++ = val >> 24; *dst++ = val >> 24;
} }
dst += c->cursor_stride - c->cursor_w * 4;
} }
break; break;
default: default:
......
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