projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a805599
)
shorten: move declaration of 'ret' to top of shorten_decode_frame()
author
Justin Ruggles
<justin.ruggles@gmail.com>
Fri, 16 Sep 2011 15:24:14 +0000
(11:24 -0400)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Thu, 20 Oct 2011 17:09:25 +0000
(13:09 -0400)
libavcodec/shorten.c
patch
|
blob
|
history
diff --git
a/libavcodec/shorten.c
b/libavcodec/shorten.c
index
638d886
..
2502587
100644
(file)
--- a/
libavcodec/shorten.c
+++ b/
libavcodec/shorten.c
@@
-382,6
+382,8
@@
static int shorten_decode_frame(AVCodecContext *avctx,
ShortenContext *s = avctx->priv_data;
int i, input_buf_size = 0;
int16_t *samples = data;
+ int ret;
+
if(s->max_framesize == 0){
void *tmp_ptr;
s->max_framesize= 1024; // should hopefully be enough for the first header
@@
-417,7
+419,6
@@
static int shorten_decode_frame(AVCodecContext *avctx,
skip_bits(&s->gb, s->bitindex);
if (!s->blocksize)
{
- int ret;
if ((ret = read_header(s)) < 0)
return ret;
*data_size = 0;
@@
-464,7
+465,6
@@
static int shorten_decode_frame(AVCodecContext *avctx,
*data_size = 0;
} else {
/* process audio command */
- int ret;
int residual_size = 0;
int channel = s->cur_chan;
int32_t coffset;