g2meet: Respect cursor_stride properly everywhere
authorKostya Shishkov <kostya.shishkov@gmail.com>
Wed, 25 Sep 2013 09:09:33 +0000 (12:09 +0300)
committerMartin Storsjö <martin@martin.st>
Wed, 25 Sep 2013 14:42:01 +0000 (17:42 +0300)
This fixes a regression with rgb cursors since b1e46988.

Signed-off-by: Martin Storsjö <martin@martin.st>
libavcodec/g2meet.c

index 1bbac2d..e7743e7 100644 (file)
@@ -540,6 +540,7 @@ static int g2m_load_cursor(AVCodecContext *avctx, G2MContext *c,
                     bits <<= 1;
                 }
             }
+            dst += c->cursor_stride - c->cursor_w * 4;
         }
 
         dst = c->cursor;
@@ -565,6 +566,7 @@ static int g2m_load_cursor(AVCodecContext *avctx, G2MContext *c,
                     bits <<= 1;
                 }
             }
+            dst += c->cursor_stride - c->cursor_w * 4;
         }
         break;
     case 32: // full colour
@@ -578,6 +580,7 @@ static int g2m_load_cursor(AVCodecContext *avctx, G2MContext *c,
                 *dst++ = val >> 16;
                 *dst++ = val >> 24;
             }
+            dst += c->cursor_stride - c->cursor_w * 4;
         }
         break;
     default: