diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 04:48:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 04:49:54 +0100 |
| commit | 5d9e663064416a661e5af5040a33b70a309632db (patch) | |
| tree | 90396cb6c3ba2e350e3cb859aaaf073147f20c03 /libavcodec/g2meet.c | |
| parent | f09f295109b3d333ecd97f4c200fd543add0e416 (diff) | |
| parent | 01f6df01b6fdc2d71b82370374cde4bf102928c7 (diff) | |
| download | ffmpeg-5d9e663064416a661e5af5040a33b70a309632db.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
go2meeting: disallow tile dimensions that are not multiple of 16
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g2meet.c')
| -rw-r--r-- | libavcodec/g2meet.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 4f26258973..c585d0de9b 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -713,7 +713,8 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data, } c->tile_width = bytestream2_get_be32(&bc); c->tile_height = bytestream2_get_be32(&bc); - if (!c->tile_width || !c->tile_height) { + if (!c->tile_width || !c->tile_height || + ((c->tile_width | c->tile_height) & 0xF)) { av_log(avctx, AV_LOG_ERROR, "Invalid tile dimensions %dx%d\n", c->tile_width, c->tile_height); |