[FFmpeg-cvslog] shorten: pass on error value from allocate_buffers() instead of returning -1
Justin Ruggles
git at videolan.org
Fri Oct 21 02:37:08 CEST 2011
ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Fri Sep 16 11:22:37 2011 -0400| [a8055992c0a15b6fc76c593c8cbee9a611ca28ff] | committer: Justin Ruggles
shorten: pass on error value from allocate_buffers() instead of returning -1
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a8055992c0a15b6fc76c593c8cbee9a611ca28ff
---
libavcodec/shorten.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
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);
More information about the ffmpeg-cvslog
mailing list