[FFmpeg-cvslog] g2meet: check ff_set_dimensions return value

[Vittorio Giovara]

ffmpeg | branch: release/2.4 | Vittorio Giovara <vittorio.giovara at gmail.com> | Wed Nov 12 11:13:04 2014 +0100| [796bd81835ebcb69d40bc87b33f13924a5937a1b] | committer: Luca Barbato

g2meet: check ff_set_dimensions return value

CC: libav-stable at libav.org
Bug-Id: CID 1135739
(cherry picked from commit 2b5c1efa1465d8646f8be525cace7a21404e40ad)
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=796bd81835ebcb69d40bc87b33f13924a5937a1b
---

 libavcodec/g2meet.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index c405f38..33934f1 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,