From c88ac1e0233f34582312dc617261b9270b61df19 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 25 Sep 2013 00:25:23 +0200 Subject: avcodec/g2meet: fix regression with rgb cursors Fixes Ticket2972 Signed-off-by: Michael Niedermayer --- libavcodec/g2meet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec') diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 1eae1a4..1667149 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -490,7 +490,7 @@ static int g2m_load_cursor(AVCodecContext *avctx, G2MContext *c, cursor_hot_y = bytestream2_get_byte(gb); cursor_fmt = bytestream2_get_byte(gb); - cursor_stride = FFALIGN(cursor_w, 32) * 4; + cursor_stride = FFALIGN(cursor_w, c->cursor_fmt==1 ? 32 : 1) * 4; if (cursor_w < 1 || cursor_w > 256 || cursor_h < 1 || cursor_h > 256) { -- cgit v1.1