virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

g2meet: check ff_set_dimensions return value

Browse Source 
CC: libav-stable@libav.org
Bug-Id: CID 1135739
This commit is contained in:
Vittorio Giovara
2014-11-12 11:13:04 +01:00
parent c6d7c201df
commit 2b5c1efa14
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/g2meet.c
View File

@@ -719,8 +719,11 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data,
ret = AVERROR_INVALIDDATA; ret = AVERROR_INVALIDDATA;
goto header_fail; goto header_fail;
} }
if (c->width != avctx->width || c->height != avctx->height) if (c->width != avctx->width || c->height != avctx->height) {
ff_set_dimensions(avctx, c->width, c->height); ret = ff_set_dimensions(avctx, c->width, c->height);
if (ret < 0)
return ret;
}
c->compression = bytestream2_get_be32(&bc); c->compression = bytestream2_get_be32(&bc);
if (c->compression != 2 && c->compression != 3) { if (c->compression != 2 && c->compression != 3) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,