From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Fri, 16 Sep 2011 15:22:37 +0000 (-0400)
Subject: shorten: pass on error value from allocate_buffers() instead of returning -1
X-Git-Tag: v0.8b1~1043
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a8055992c0a15b6fc76c593c8cbee9a611ca28ff;p=platform%2Fupstream%2Flibav.git

shorten: pass on error value from allocate_buffers() instead of returning -1
---

diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index ad274b4..638d886 100644
--- a/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@ -306,7 +306,7 @@ static int decode_subframe_lpc(ShortenContext *s, int channel,
 
 static int read_header(ShortenContext *s)
 {
-    int i;
+    int i, ret;
     int maxnlpc = 0;
     /* shorten signature */
     if (get_bits_long(&s->gb, 32) != AV_RB32("ajkg")) {
@@ -342,8 +342,8 @@ static int read_header(ShortenContext *s)
     }
     s->nwrap = FFMAX(NWRAP, maxnlpc);
 
-    if (allocate_buffers(s))
-        return -1;
+    if ((ret = allocate_buffers(s)) < 0)
+        return ret;
 
     init_offset(s);