Commit 45d7d31f authored by Justin Ruggles's avatar Justin Ruggles

shorten: move declaration of 'ret' to top of shorten_decode_frame()

parent a8055992
...@@ -382,6 +382,8 @@ static int shorten_decode_frame(AVCodecContext *avctx, ...@@ -382,6 +382,8 @@ static int shorten_decode_frame(AVCodecContext *avctx,
ShortenContext *s = avctx->priv_data; ShortenContext *s = avctx->priv_data;
int i, input_buf_size = 0; int i, input_buf_size = 0;
int16_t *samples = data; int16_t *samples = data;
int ret;
if(s->max_framesize == 0){ if(s->max_framesize == 0){
void *tmp_ptr; void *tmp_ptr;
s->max_framesize= 1024; // should hopefully be enough for the first header s->max_framesize= 1024; // should hopefully be enough for the first header
...@@ -417,7 +419,6 @@ static int shorten_decode_frame(AVCodecContext *avctx, ...@@ -417,7 +419,6 @@ static int shorten_decode_frame(AVCodecContext *avctx,
skip_bits(&s->gb, s->bitindex); skip_bits(&s->gb, s->bitindex);
if (!s->blocksize) if (!s->blocksize)
{ {
int ret;
if ((ret = read_header(s)) < 0) if ((ret = read_header(s)) < 0)
return ret; return ret;
*data_size = 0; *data_size = 0;
...@@ -464,7 +465,6 @@ static int shorten_decode_frame(AVCodecContext *avctx, ...@@ -464,7 +465,6 @@ static int shorten_decode_frame(AVCodecContext *avctx,
*data_size = 0; *data_size = 0;
} else { } else {
/* process audio command */ /* process audio command */
int ret;
int residual_size = 0; int residual_size = 0;
int channel = s->cur_chan; int channel = s->cur_chan;
int32_t coffset; int32_t coffset;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment