aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2014-07-15 15:22:11 -0400
committerVittorio Giovara <vittorio.giovara@gmail.com>2014-07-15 20:08:16 -0400
commit14b4e64eabc84c5a5e57c8ccc56bbeb95380823b (patch)
treecc1d79154d910023e6bc87d4c82729cb7b9a3fb5 /libavcodec
parentf9900822fc5f0b0c7242ca318290c090bd5d0af0 (diff)
downloadffmpeg-14b4e64eabc84c5a5e57c8ccc56bbeb95380823b.tar.gz
g2meet: allow size changes within original sizes
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/g2meet.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index 456045dbc2..c405f38e42 100644
--- a/libavcodec/g2meet.c
+++ b/libavcodec/g2meet.c
@@ -90,6 +90,7 @@ typedef struct G2MContext {
int compression;
int width, height, bpp;
+ int orig_width, orig_height;
int tile_width, tile_height;
int tiles_x, tiles_y, tile_x, tile_y;
@@ -710,8 +711,8 @@ 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 > avctx->width ||
- c->height < 16 || c->height > avctx->height) {
+ if (c->width < 16 || c->width > c->orig_width ||
+ c->height < 16 || c->height > c->orig_height) {
av_log(avctx, AV_LOG_ERROR,
"Invalid frame dimensions %dx%d\n",
c->width, c->height);
@@ -875,6 +876,10 @@ static av_cold int g2m_decode_init(AVCodecContext *avctx)
avctx->pix_fmt = AV_PIX_FMT_RGB24;
+ // store original sizes and check against those if resize happens
+ c->orig_width = avctx->width;
+ c->orig_height = avctx->height;
+
return 0;
}