virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avcodec/g2meet: check the return code of ff_set_dimensions()

Browse Source 
This is currently redundant as the checks before it are tighter than
the checks in ff_set_dimensions() but its more robust not to depend
on that.

Fixes CID1135739
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-10 18:34:52 +01:00
parent 7fa9f7ef1c
commit 3af9d8269e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/g2meet.c
View File

@ -697,8 +697,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)
goto header_fail;
}
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,