[libav-devel] [PATCH] g2meet: Respect cursor_stride properly everywhere

[Martin Storsjö]

From: Kostya Shishkov <kostya.shish...@gmail.com>

This fixes a regression with rgb cursors since b1e46988.
---
 libavcodec/g2meet.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index 1bbac2d..e7743e7 100644
--- a/libavcodec/g2meet.c
+++ b/libavcodec/g2meet.c
@@ -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:
-- 
1.7.9.4

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel