aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2013-09-25 12:09:33 +0300
committerMartin Storsjö <martin@martin.st>2013-09-25 17:42:01 +0300
commit4370f65be8d714a0bc73047501027464aaa2466c (patch)
tree1f36cc049ad6a8a689a3ba2c0f2f7a87e420d782
parent5f4b1b1cbd0604b74cacc0870b501659240b5b45 (diff)
downloadffmpeg-4370f65be8d714a0bc73047501027464aaa2466c.tar.gz
g2meet: Respect cursor_stride properly everywhere
This fixes a regression with rgb cursors since b1e46988. Signed-off-by: Martin Storsjö <martin@martin.st>
-rw-r--r--libavcodec/g2meet.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index 1bbac2d868..e7743e7e9f 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: