diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-11-12 11:13:04 +0100 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2015-01-13 00:16:41 +0100 |
| commit | 796bd81835ebcb69d40bc87b33f13924a5937a1b (patch) | |
| tree | b953defd4177e57e983ba4ce0e96f2cc6fa3e1eb /libavcodec | |
| parent | 9e0a38d32b36fac7fd73bdb93e820ae0b9e03616 (diff) | |
| download | ffmpeg-796bd81835ebcb69d40bc87b33f13924a5937a1b.tar.gz | |
g2meet: check ff_set_dimensions return value
CC: libav-stable@libav.org
Bug-Id: CID 1135739
(cherry picked from commit 2b5c1efa1465d8646f8be525cace7a21404e40ad)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/g2meet.c | 7 |
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, |