diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-12 14:39:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-12 14:48:55 +0200 |
| commit | fa9e8bafc832dc934ea0b7861e341b948289419c (patch) | |
| tree | a24a12693364e88abc29ed5fe85625ecf9d4d326 /libavcodec/g2meet.c | |
| parent | 72abfba88458b85d24d8b2cebf7f2c06166a834b (diff) | |
| parent | b1e469885362febce3d9a4678624e44a92f77da9 (diff) | |
| download | ffmpeg-fa9e8bafc832dc934ea0b7861e341b948289419c.tar.gz | |
Merge commit 'b1e469885362febce3d9a4678624e44a92f77da9'
* commit 'b1e469885362febce3d9a4678624e44a92f77da9':
g2meet: Allocate cursor buffers large enough to fit the aligned width
See: 3c4c5ca1c194464f51de87534d15602f99bf9759
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g2meet.c')
| -rw-r--r-- | libavcodec/g2meet.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 99d4d1ec37..3e81541e68 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 = cursor_w * 4; + cursor_stride = FFALIGN(cursor_w, 32) * 4; if (cursor_w < 1 || cursor_w > 256 || cursor_h < 1 || cursor_h > 256) { @@ -516,11 +516,6 @@ static int g2m_load_cursor(AVCodecContext *avctx, G2MContext *c, return AVERROR_PATCHWELCOME; } - if (cursor_fmt == 1 && cursor_w % 32) { - avpriv_report_missing_feature(avctx, "odd monochrome cursor width %d", cursor_w); - return AVERROR_PATCHWELCOME; - } - tmp = av_realloc(c->cursor, cursor_stride * cursor_h); if (!tmp) { av_log(avctx, AV_LOG_ERROR, "Cannot allocate cursor buffer\n"); |