diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2011-09-16 11:22:37 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2011-10-20 13:09:25 -0400 |
| commit | a8055992c0a15b6fc76c593c8cbee9a611ca28ff (patch) | |
| tree | 0d63fee6b9e28832c6d9a438f84ec8765b02a1b0 /libavcodec/shorten.c | |
| parent | 9e5e2c2d010c05c10337e9c1ec9d0d61495e0c9c (diff) | |
| download | ffmpeg-a8055992c0a15b6fc76c593c8cbee9a611ca28ff.tar.gz | |
shorten: pass on error value from allocate_buffers() instead of returning -1
Diffstat (limited to 'libavcodec/shorten.c')
| -rw-r--r-- | libavcodec/shorten.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index ad274b4b04..638d886c4f 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); |