aboutsummaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorVittorio Giovara2014-11-12 11:13:04 +0100
committerVittorio Giovara2014-11-13 01:41:26 +0100
commit2b5c1efa1465d8646f8be525cace7a21404e40ad (patch)
treedcd070a22b73d01dfa24d1635f766e271eb6c78d /libavcodec
parentc6d7c201dfa80502cb6cefbee7dc9160cedb5187 (diff)
g2meet: check ff_set_dimensions return value
CC: libav-stable@libav.org Bug-Id: CID 1135739
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/g2meet.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index c405f38e42..33934f1bf7 100644
--- a/libavcodec/g2meet.c
+++ b/libavcodec/g2meet.c
@@ -719,8 +719,11 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data,
ret = AVERROR_INVALIDDATA;
goto header_fail;
}
- if (c->width != avctx->width || c->height != avctx->height)
- ff_set_dimensions(avctx, c->width, c->height);
+ if (c->width != avctx->width || c->height != avctx->height) {
+ ret = ff_set_dimensions(avctx, c->width, c->height);
+ if (ret < 0)
+ return ret;
+ }
c->compression = bytestream2_get_be32(&bc);
if (c->compression != 2 && c->compression != 3) {
av_log(avctx, AV_LOG_ERROR,