virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit 'b1e469885362febce3d9a4678624e44a92f77da9'

Browse Source 
* commit 'b1e469885362febce3d9a4678624e44a92f77da9':
  g2meet: Allocate cursor buffers large enough to fit the aligned width

See: 3c4c5ca1c1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-09-12 14:39:42 +02:00
parent 72abfba884 b1e4698853
commit fa9e8bafc8
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/g2meet.c
View File

@@ -490,7 +490,7 @@ static int g2m_load_cursor(AVCodecContext *avctx, G2MContext *c,
cursor_hot_y = bytestream2_get_byte(gb); cursor_hot_y = bytestream2_get_byte(gb);
cursor_fmt = 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 || if (cursor_w < 1 || cursor_w > 256 ||
cursor_h < 1 || cursor_h > 256) { cursor_h < 1 || cursor_h > 256) {
@@ -516,11 +516,6 @@ static int g2m_load_cursor(AVCodecContext *avctx, G2MContext *c,
return AVERROR_PATCHWELCOME; 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); tmp = av_realloc(c->cursor, cursor_stride * cursor_h);
if (!tmp) { if (!tmp) {
av_log(avctx, AV_LOG_ERROR, "Cannot allocate cursor buffer\n"); av_log(avctx, AV_LOG_ERROR, "Cannot allocate cursor buffer\n");