diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-25 00:25:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-25 00:25:23 +0200 |
| commit | c88ac1e0233f34582312dc617261b9270b61df19 (patch) | |
| tree | 77ac820f8df07e27323846e22b4748b105d40509 /libavcodec | |
| parent | dcc7686ae7ce99215111911d142a21c9ea219614 (diff) | |
| download | ffmpeg-streaming-c88ac1e0233f34582312dc617261b9270b61df19.zip ffmpeg-streaming-c88ac1e0233f34582312dc617261b9270b61df19.tar.gz | |
avcodec/g2meet: fix regression with rgb cursors
Fixes Ticket2972
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/g2meet.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |
