diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-10 09:13:32 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-10 09:13:32 +0200 |
| commit | d3952510d21a4b337e7483b38c2630656500b300 (patch) | |
| tree | 3cf80916e20063c1f788897557482c8c5fc1bacf /libavcodec | |
| parent | dab5f65b25f1c9c3de4d1f42c135768b72f45351 (diff) | |
| parent | 3a4d369ea4ded91b1178ae6e2ff0ab9ea470e344 (diff) | |
Merge commit '3a4d369ea4ded91b1178ae6e2ff0ab9ea470e344'
* commit '3a4d369ea4ded91b1178ae6e2ff0ab9ea470e344':
g2m: Relax resolution change constraints
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/g2meet.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index ba83c67337..2815704997 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -1423,8 +1423,7 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data, } c->width = bytestream2_get_be32(&bc); c->height = bytestream2_get_be32(&bc); - if (c->width < 16 || c->width > c->orig_width || - c->height < 16 || c->height > c->orig_height) { + if (c->width < 16 || c->height < 16) { av_log(avctx, AV_LOG_ERROR, "Invalid frame dimensions %dx%d\n", c->width, c->height); |