aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara at gmail.com>2015-10-07 15:16:44 +0200
committerLuca Barbato <lu_zero@gentoo.org>2015-10-07 18:45:49 +0200
commit3a4d369ea4ded91b1178ae6e2ff0ab9ea470e344 (patch)
treef4e730472442e620cd416dca077ca9aaa8d1d86a /libavcodec
parent39f01e346cab464ef6c0d4ec58cc13b7123e60d8 (diff)
downloadffmpeg-3a4d369ea4ded91b1178ae6e2ff0ab9ea470e344.tar.gz
g2m: Relax resolution change constraints
Do not fail when original resolution is smaller than current one, as the frame buffer is resized automatically. Signed-off-by: Vittorio Giovara <vittorio.giovara at gmail.com>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/g2meet.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index 85f53e2bbe..a89610d6c3 100644
--- a/libavcodec/g2meet.c
+++ b/libavcodec/g2meet.c
@@ -1410,8 +1410,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);