[FFmpeg-cvslog] shorten: move declaration of 'ret' to top of shorten_decode_frame()

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:24:14 2011 -0400| [45d7d31fb94ded19de2bfdb064804e617c068879] | committer: Justin Ruggles

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=45d7d31fb94ded19de2bfdb064804e617c068879
---

 libavcodec/shorten.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index 638d886..2502587 100644
--- 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;



More information about the ffmpeg-cvslog mailing list