aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/gif.c
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2013-04-18 00:19:33 +0200
committerClément Bœsch <ubitux@gmail.com>2013-04-18 00:24:25 +0200
commit71411b69a22526832e2c8d92cd1faf60e05528a3 (patch)
tree9e8245ce0e284393249d9cc17b47d827763ea334 /libavcodec/gif.c
parentdfb323109c6218e46d71d07583a2643e973190b1 (diff)
downloadffmpeg-71411b69a22526832e2c8d92cd1faf60e05528a3.tar.gz
lavc/gif: merge two allocation checks.
Diffstat (limited to 'libavcodec/gif.c')
-rw-r--r--libavcodec/gif.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/gif.c b/libavcodec/gif.c
index f373819b4f..66847bb783 100644
--- a/libavcodec/gif.c
+++ b/libavcodec/gif.c
@@ -191,11 +191,9 @@ static av_cold int gif_encode_init(AVCodecContext *avctx)
avctx->coded_frame = &s->picture;
s->lzw = av_mallocz(ff_lzw_encode_state_size);
- if (!s->lzw)
- return AVERROR(ENOMEM);
s->buf = av_malloc(avctx->width*avctx->height*2);
- if (!s->buf)
- return AVERROR(ENOMEM);
+ if (!s->buf || !s->lzw)
+ return AVERROR(ENOMEM);
return 0;
}