avcodec/g2meet: fix regression with rgb cursors

Fixes Ticket2972 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/g2meet: fix regression with rgb cursors
Fixes Ticket2972 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
c88ac1e0 · Michael Niedermayer · dcc7686a · c88ac1e0
Commit c88ac1e0 authored Sep 24, 2013 by Michael Niedermayer
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

g2meet.c libavcodec/g2meet.c +1 -1

No files found.
--- 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) {