From 71411b69a22526832e2c8d92cd1faf60e05528a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux@gmail.com>
Date: Thu, 18 Apr 2013 00:19:33 +0200
Subject: [PATCH] lavc/gif: merge two allocation checks.

---
 libavcodec/gif.c | 6 ++----
 1 file 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;
 }